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

Side by Side Diff: mobile/android/base/resources/xml/preferences_abb_abp.xml

Issue 29543774: Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen (Closed)
Patch Set: Created Sept. 13, 2017, 5:01 p.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 <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_languages" 17 <PreferenceScreen android:title="@string/abb_pref_category_languages"
18 android:summary="@string/abb_pref_category_languages_s ummary" 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 <PreferenceScreen
30 android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent"
31 android:summary="@string/abb_pref_category_whitelisted_websites_summ ary"
32 android:title="@string/abb_pref_category_whitelisted_websites">
33 <extra
34 android:name="resource"
35 android:value="preferences_abb_whitelisted_websites"/>
36 </PreferenceScreen>
29 </PreferenceCategory> 37 </PreferenceCategory>
30 38
31 <PreferenceCategory android:title="@string/abb_pref_category_exceptions" 39 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"
32 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > 40 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" >
33 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" 41 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s"
34 android:summary="@string/abb_pref_category_acceptable_ ads_summary" 42 android:summary="@string/abb_pref_category_acceptable_ ads_summary"
35 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > 43 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >
36 <extra android:name="resource" 44 <extra android:name="resource"
37 android:value="preferences_abb_abp_acceptable_ads" /> 45 android:value="preferences_abb_abp_acceptable_ads" />
38 </PreferenceScreen> 46 </PreferenceScreen>
39 <!-- Commented out until implemented
40 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites"
41 android:summary="@string/abb_pref_category_whitelisted _sites_summary" >
42 </PreferenceScreen>
43 -->
44 </PreferenceCategory> 47 </PreferenceCategory>
45 48
46 </PreferenceScreen> 49 </PreferenceScreen>
47 50
OLDNEW

Powered by Google App Engine
This is Rietveld