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

Side by Side Diff: mobile/android/base/resources/xml-v11/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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 <org.adblockplus.browser.AbpCheckBoxPreference android:defaultValue="true"
anton 2016/09/30 07:18:21 i can see previously `android:title` was the first
diegocarloslima 2016/10/26 12:34:17 I've just looked into our sources and it seems tha
10 android:key="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabl ed"
11 android:persistent="false" android:summary="@string/abb_pref_category_ab p_summary"
12 android:title="@string/abb_pref_category_abp" />
13
14 <PreferenceCategory android:dependency="android.not_a_preference.adblockbrow ser.apiAdblockPlusEnabled"
15 android:title="@string/abb_pref_category_blocking">
anton 2016/09/30 07:18:21 reorder to make the first again?
10 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" 16 <PreferenceScreen android:title="@string/abb_pref_category_adblocking"
11 android:summary="@string/abb_pref_category_adblocking_ summary" 17 android:summary="@string/abb_pref_category_adblocking_ summary"
12 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > 18 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >
13 <extra android:name="resource" 19 <extra android:name="resource"
14 android:value="preferences_abb_adblocking" /> 20 android:value="preferences_abb_adblocking" />
15 </PreferenceScreen> 21 </PreferenceScreen>
16 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " 22 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking "
17 android:summary="@string/abb_pref_category_more_blocki ng_summary" 23 android:summary="@string/abb_pref_category_more_blocki ng_summary"
18 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > 24 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >
19 <extra android:name="resource" 25 <extra android:name="resource"
20 android:value="preferences_abb_more_blocking" /> 26 android:value="preferences_abb_more_blocking" />
21 </PreferenceScreen> 27 </PreferenceScreen>
22 </PreferenceCategory> 28 </PreferenceCategory>
23 29
24 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"> 30 <PreferenceCategory android:dependency="android.not_a_preference.adblockbrow ser.apiAdblockPlusEnabled"
31 android:title="@string/abb_pref_category_exceptions">
anton 2016/09/30 07:18:21 reorder to make the first again?
25 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" 32 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s"
26 android:summary="@string/abb_pref_category_acceptable_ ads_summary" 33 android:summary="@string/abb_pref_category_acceptable_ ads_summary"
27 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > 34 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >
28 <extra android:name="resource" 35 <extra android:name="resource"
29 android:value="preferences_abb_abp_acceptable_ads" /> 36 android:value="preferences_abb_abp_acceptable_ads" />
30 </PreferenceScreen> 37 </PreferenceScreen>
31 <!-- Commented out until implemented 38 <!-- Commented out until implemented
32 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" 39 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites"
33 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > 40 android:summary="@string/abb_pref_category_whitelisted _sites_summary" >
34 </PreferenceScreen> 41 </PreferenceScreen>
35 --> 42 -->
36 </PreferenceCategory> 43 </PreferenceCategory>
37 44
38 </PreferenceScreen> 45 </PreferenceScreen>
39 46
OLDNEW

Powered by Google App Engine
This is Rietveld