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

Delta Between Two Patch Sets: mobile/android/base/resources/xml/preferences_abb_abp.xml

Issue 29342912: Issue 3070 - Create Adblock Plus on/off switch (Closed)
Left Patch Set: Created May 23, 2016, 11:02 a.m.
Right Patch Set: Adjusting preferences xml attributes order Created Oct. 26, 2016, 12:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « mobile/android/base/resources/xml-v11/preferences_abb_abp.xml ('k') | mobile/android/base/strings.xml.in » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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:defaultValue="true" 9 <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_pr eference.adblockbrowser.apiAdblockPlusEnabled"
10 android:key="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabl ed" 10 android:title="@string/abb_pref_category_abp"
11 android:persistent="false" android:summary="@string/abb_pref_category_ab p_summary" 11 android:summary="@string/abb_pref_category_abp_summary"
12 android:title="@string/abb_pref_category_abp" /> 12 android:defaultValue="true"
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
13 android:persistent="false" />
13 14
14 <PreferenceCategory android:dependency="android.not_a_preference.adblockbrow ser.apiAdblockPlusEnabled" 15 <PreferenceCategory android:title="@string/abb_pref_category_blocking"
15 android:title="@string/abb_pref_category_blocking"> 16 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" >
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
16 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" 17 <PreferenceScreen android:title="@string/abb_pref_category_adblocking"
17 android:summary="@string/abb_pref_category_adblocking_ summary" > 18 android:summary="@string/abb_pref_category_adblocking_ summary" >
18 <intent android:action="android.intent.action.VIEW" 19 <intent android:action="android.intent.action.VIEW"
19 android:targetPackage="@string/android_package_name" 20 android:targetPackage="@string/android_package_name"
20 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > 21 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" >
21 <extra android:name="resource" 22 <extra android:name="resource"
22 android:value="preferences_abb_adblocking" /> 23 android:value="preferences_abb_adblocking" />
23 </intent> 24 </intent>
24 </PreferenceScreen> 25 </PreferenceScreen>
25 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " 26 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking "
26 android:summary="@string/abb_pref_category_more_blocki ng_summary" > 27 android:summary="@string/abb_pref_category_more_blocki ng_summary" >
27 <intent android:action="android.intent.action.VIEW" 28 <intent android:action="android.intent.action.VIEW"
28 android:targetPackage="@string/android_package_name" 29 android:targetPackage="@string/android_package_name"
29 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > 30 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" >
30 <extra android:name="resource" 31 <extra android:name="resource"
31 android:value="preferences_abb_more_blocking" /> 32 android:value="preferences_abb_more_blocking" />
32 </intent> 33 </intent>
33 </PreferenceScreen> 34 </PreferenceScreen>
34 </PreferenceCategory> 35 </PreferenceCategory>
35 <PreferenceCategory android:dependency="android.not_a_preference.adblockbrow ser.apiAdblockPlusEnabled" 36 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"
36 android:title="@string/abb_pref_category_exceptions"> 37 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" >
anton 2016/09/30 07:18:21 reorder to make 'android:title' the first again?
37 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" 38 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s"
38 android:summary="@string/abb_pref_category_acceptable_ ads_summary" > 39 android:summary="@string/abb_pref_category_acceptable_ ads_summary" >
39 <intent android:action="android.intent.action.VIEW" 40 <intent android:action="android.intent.action.VIEW"
40 android:targetPackage="@string/android_package_name" 41 android:targetPackage="@string/android_package_name"
41 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > 42 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" >
42 <extra android:name="resource" 43 <extra android:name="resource"
43 android:value="preferences_abb_abp_acceptable_ads" /> 44 android:value="preferences_abb_abp_acceptable_ads" />
44 </intent> 45 </intent>
45 </PreferenceScreen> 46 </PreferenceScreen>
46 <!-- Commented out until implemented 47 <!-- Commented out until implemented
47 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" 48 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites"
48 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > 49 android:summary="@string/abb_pref_category_whitelisted _sites_summary" >
49 </PreferenceScreen> 50 </PreferenceScreen>
50 --> 51 -->
51 </PreferenceCategory> 52 </PreferenceCategory>
52 53
53 </PreferenceScreen> 54 </PreferenceScreen>
54 55
LEFTRIGHT
« mobile/android/base/resources/xml-v11/preferences_abb_abp.xml ('k') | mobile/android/base/strings.xml.in » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld