Delta Between Two Patch Sets: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml
Issue 29370610:
Issue 4760 - Change Ad blocking settings text (Closed)
Left Patch Set:
Created Jan. 2, 2017, 4:07 p.m.
Right Patch Set: Renaming category_filters to category_languages
Created Jan. 2, 2017, 5:09 p.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/xml-v11/preferences.xml ('k')
|
mobile/android/base/resources/xml/preferences.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 <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_pr eference.adblockbrowser.apiAdblockPlusEnabled" | 9 <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_pr eference.adblockbrowser.apiAdblockPlusEnabled" |
| 10 android:title="@string/abb_pref_category_abp" | 10 android:title="@string/abb_pref_category_abp" |
| 11 android:summary="@string/abb_pref_category_abp_summary" | 11 android:summary="@string/abb_pref_category_abp_summary" |
| 12 android:defaultValue="true" | 12 android:defaultValue="true" |
| 13 android:persistent="false" /> | 13 android:persistent="false" /> |
| 14 | 14 |
| 15 <PreferenceCategory android:title="@string/abb_pref_category_blocking" | 15 <PreferenceCategory android:title="@string/abb_pref_category_blocking" |
| 16 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > | 16 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > |
| 17 <PreferenceScreen android:title="@string/abb_pref_category_filters" | 17 <PreferenceScreen android:title="@string/abb_pref_category_languages" |
|
Felix Dahlke
2017/01/02 16:48:20
I'd rather call this "adblocking_languages" or jus
| |
| 18 android:summary="@string/abb_pref_category_filters_sum mary" | 18 android:summary="@string/abb_pref_category_languages_s ummary" |
| 19 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 19 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 20 <extra android:name="resource" | 20 <extra android:name="resource" |
| 21 android:value="preferences_abb_adblocking" /> | 21 android:value="preferences_abb_adblocking" /> |
| 22 </PreferenceScreen> | 22 </PreferenceScreen> |
| 23 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " | 23 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " |
| 24 android:summary="@string/abb_pref_category_more_blocki ng_summary" | 24 android:summary="@string/abb_pref_category_more_blocki ng_summary" |
| 25 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 25 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 26 <extra android:name="resource" | 26 <extra android:name="resource" |
| 27 android:value="preferences_abb_more_blocking" /> | 27 android:value="preferences_abb_more_blocking" /> |
| 28 </PreferenceScreen> | 28 </PreferenceScreen> |
| 29 </PreferenceCategory> | 29 </PreferenceCategory> |
| 30 | 30 |
| 31 <PreferenceCategory android:title="@string/abb_pref_category_exceptions" | 31 <PreferenceCategory android:title="@string/abb_pref_category_exceptions" |
| 32 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > | 32 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > |
| 33 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" | 33 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" |
| 34 android:summary="@string/abb_pref_category_acceptable_ ads_summary" | 34 android:summary="@string/abb_pref_category_acceptable_ ads_summary" |
| 35 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > | 35 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 36 <extra android:name="resource" | 36 <extra android:name="resource" |
| 37 android:value="preferences_abb_abp_acceptable_ads" /> | 37 android:value="preferences_abb_abp_acceptable_ads" /> |
| 38 </PreferenceScreen> | 38 </PreferenceScreen> |
| 39 <!-- Commented out until implemented | 39 <!-- Commented out until implemented |
| 40 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" | 40 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" |
| 41 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > | 41 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > |
| 42 </PreferenceScreen> | 42 </PreferenceScreen> |
| 43 --> | 43 --> |
| 44 </PreferenceCategory> | 44 </PreferenceCategory> |
| 45 | 45 |
| 46 </PreferenceScreen> | 46 </PreferenceScreen> |
| 47 | 47 |
| LEFT | RIGHT |
« mobile/android/base/resources/xml-v11/preferences.xml ('k')
|
mobile/android/base/resources/xml/preferences.xml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
