mobile/android/base/resources/xml/preferences_abb_abp_acceptable_ads.xml - Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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

Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)

Patch Set: Changed screen title Created July 20, 2015, 5 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

« mobile/android/base/resources/layout/abb_custom_prefscreen.xml ('K') | « mobile/android/base/resources/xml/preferences_abb_abp.xml ('k') | mobile/android/base/resources/xml/preferences_abb_adblocking.xml » ('j') | mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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

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/. -->

5

6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"	2 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

7 xmlns:gecko="http://schemas.android.com/apk/res-auto"	3 xmlns:gecko="http://schemas.android.com/apk/res-auto"

8 android:title="@string/pref_category_privacy_short"	4 android:title="@string/pref_category_privacy_short" >

9 android:enabled="false">

10	5

11 <!-- keys prefixed with "android.not_a_preference." are not synced with Geck o -->	6 <!-- keys prefixed with "android.not_a_preference." are not synced with Geck o -->

12 <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_pr eference.adblockbrowser.apiAcceptableAdsEnabled"	7 <org.adblockplus.browser.AbpCheckBoxPreference android:key="android.not_a_pr eference.adblockbrowser.apiAcceptableAdsEnabled"

13 android:title="@string/abb_pref_acceptable_ads"	8 android:title="@string/abb_pref_acceptable_ads"

14 android:defaultValue="true"	9 android:defaultValue="true"

15 android:persistent="false"	10 android:persistent="false"

16 android:enabled="false" />	11 android:enabled="false" />

17	12

18 <!-- android:title="About Acceptable ads" -->

19 <PreferenceCategory android:title="@string/abb_pref_about_acceptable_ads">	13 <PreferenceCategory android:title="@string/abb_pref_about_acceptable_ads">

20 <Preference android:key="android.not_a_preference.abb.aboutAcceptableAds "	14 <Preference android:key="android.not_a_preference.abb.aboutAcceptableAds "

21 android:selectable="false"	15 android:selectable="false"

22 android:persistent="false"	16 android:persistent="false"

23 android:summary="@string/abb_pref_category_acceptable_ads_ex tra_summary" />	17 android:summary="@string/abb_pref_category_acceptable_ads_ex tra_summary" />

24 </PreferenceCategory>	18 </PreferenceCategory>

25	19

26 </PreferenceScreen>	20 </PreferenceScreen>

27	21

28	22

OLD	NEW