Delta Between Two Patch Sets: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml
Issue 29322610:
Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)
Left Patch Set: Changed screen title
Created July 20, 2015, 5 p.m.
Right Patch Set: Last naming nit
Created July 31, 2015, 9:36 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/resources/values/abb_colors.xml ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| 3 - License, v. 2.0. If a copy of the MPL was not distributed with this | 3 - License, v. 2.0. If a copy of the MPL was not distributed with this |
| 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| 5 | 5 |
| 6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" | 6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| 7 xmlns:gecko="http://schemas.android.com/apk/res-auto" > | 7 xmlns:gecko="http://schemas.android.com/apk/res-auto" > |
| 8 | 8 |
| 9 <PreferenceCategory android:title="@string/abb_pref_category_blocking"> | 9 <PreferenceCategory android:title="@string/abb_pref_category_blocking"> |
| 10 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" | 10 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| 11 android:summary="@string/abb_pref_category_adblocking_ summary" | 11 android:summary="@string/abb_pref_category_adblocking_ summary" |
| 12 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 12 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 13 <extra android:name="resource" | 13 <extra android:name="resource" |
| 14 android:value="preferences_abb_adblocking" /> | 14 android:value="preferences_abb_adblocking" /> |
| 15 </PreferenceScreen> | 15 </PreferenceScreen> |
| 16 <PreferenceScreen android:title="@string/abb_pref_category_further_block ing" | 16 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " |
| 17 android:summary="@string/abb_pref_category_further_blo cking_summary" | 17 android:summary="@string/abb_pref_category_more_blocki ng_summary" |
| 18 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 18 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 19 <extra android:name="resource" | 19 <extra android:name="resource" |
| 20 android:value="preferences_abb_further_blocking" /> | 20 android:value="preferences_abb_more_blocking" /> |
| 21 </PreferenceScreen> | 21 </PreferenceScreen> |
| 22 </PreferenceCategory> | 22 </PreferenceCategory> |
| 23 | 23 |
| 24 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"> | 24 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"> |
| 25 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" | 25 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" |
| 26 android:summary="@string/abb_pref_category_acceptable_ ads_summary" | 26 android:summary="@string/abb_pref_category_acceptable_ ads_summary" |
| 27 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 27 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 28 <extra android:name="resource" | 28 <extra android:name="resource" |
| 29 android:value="preferences_abb_abp_acceptable_ads" /> | 29 android:value="preferences_abb_abp_acceptable_ads" /> |
| 30 </PreferenceScreen> | 30 </PreferenceScreen> |
| 31 <!-- Commented out until implemented | 31 <!-- Commented out until implemented |
| 32 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" | 32 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" |
| 33 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > | 33 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > |
| 34 </PreferenceScreen> | 34 </PreferenceScreen> |
| 35 --> | 35 --> |
| 36 </PreferenceCategory> | 36 </PreferenceCategory> |
| 37 | 37 |
| 38 </PreferenceScreen> | 38 </PreferenceScreen> |
| 39 | 39 |
| LEFT | RIGHT |
« mobile/android/base/resources/values/abb_colors.xml ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
