Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: mobile/android/base/resources/xml/preferences_abb_abp.xml

Issue 29342912: Issue 3070 - Create Adblock Plus on/off switch (Closed)
Patch Set: Created May 23, 2016, 11:02 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mobile/android/base/resources/xml/preferences_abb_abp.xml
===================================================================
--- a/mobile/android/base/resources/xml/preferences_abb_abp.xml
+++ b/mobile/android/base/resources/xml/preferences_abb_abp.xml
@@ -1,17 +1,23 @@
<?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:defaultValue="true"
+ android:key="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled"
+ android:persistent="false" android:summary="@string/abb_pref_category_abp_summary"
+ android:title="@string/abb_pref_category_abp" />
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
+
+ <PreferenceCategory android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled"
+ android:title="@string/abb_pref_category_blocking">
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
<PreferenceScreen android:title="@string/abb_pref_category_adblocking"
android:summary="@string/abb_pref_category_adblocking_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra android:name="resource"
android:value="preferences_abb_adblocking" />
</intent>
@@ -21,17 +27,18 @@
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra android:name="resource"
android:value="preferences_abb_more_blocking" />
</intent>
</PreferenceScreen>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/abb_pref_category_exceptions">
+ <PreferenceCategory android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled"
+ android:title="@string/abb_pref_category_exceptions">
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
<PreferenceScreen android:title="@string/abb_pref_category_acceptable_ads"
android:summary="@string/abb_pref_category_acceptable_ads_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra android:name="resource"
android:value="preferences_abb_abp_acceptable_ads" />
</intent>

Powered by Google App Engine
This is Rietveld