Unified Diff: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml
Issue 29342912:
Issue 3070 - Create Adblock Plus on/off switch (Closed)
Patch Set: Adjusting preferences xml attributes order
Created Oct. 26, 2016, 12:37 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/locales/adblockbrowser/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| =================================================================== |
| --- a/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| +++ b/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| @@ -1,32 +1,40 @@ |
| <?xml version="1.0" encoding="utf-8"?> |
| <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| - License, v. 2.0. If a copy of the MPL was not distributed with this |
| - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| xmlns:gecko="http://schemas.android.com/apk/res-auto" > |
| - <PreferenceCategory android:title="@string/abb_pref_category_blocking"> |
| + <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" |
| + android:title="@string/abb_pref_category_abp" |
| + android:summary="@string/abb_pref_category_abp_summary" |
| + android:defaultValue="true" |
| + android:persistent="false" /> |
| + |
| + <PreferenceCategory android:title="@string/abb_pref_category_blocking" |
| + android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" > |
| <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| android:summary="@string/abb_pref_category_adblocking_summary" |
| android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| <extra android:name="resource" |
| android:value="preferences_abb_adblocking" /> |
| </PreferenceScreen> |
| <PreferenceScreen android:title="@string/abb_pref_category_more_blocking" |
| android:summary="@string/abb_pref_category_more_blocking_summary" |
| android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| <extra android:name="resource" |
| android:value="preferences_abb_more_blocking" /> |
| </PreferenceScreen> |
| </PreferenceCategory> |
| - <PreferenceCategory android:title="@string/abb_pref_category_exceptions"> |
| + <PreferenceCategory android:title="@string/abb_pref_category_exceptions" |
| + android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" > |
| <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ads" |
| android:summary="@string/abb_pref_category_acceptable_ads_summary" |
| android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| <extra android:name="resource" |
| android:value="preferences_abb_abp_acceptable_ads" /> |
| </PreferenceScreen> |
| <!-- Commented out until implemented |
| <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_sites" |
« no previous file with comments
|
« mobile/android/base/locales/adblockbrowser/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
no next file with comments »
