mobile/android/base/resources/xml/preferences_abb_abp.xml - Issue 29543774: Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen

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

Unified 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: Adjustments accordingly to Thomas's comments. Also, adjusting strings for multilocale build Created Sept. 19, 2017, 3:18 p.m.

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

Jump to:

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

@@ -21,27 +21,30 @@

android:value="preferences_abb_adblocking"/>

</PreferenceScreen>

<PreferenceScreen android:title="@string/abb_pref_category_more_blocking"

android:summary="@string/abb_pref_category_more_blocking_summary"

android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

<extra android:name="resource"

android:value="preferences_abb_more_blocking" />

</PreferenceScreen>

+ <PreferenceScreen

+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

+ android:summary="@string/abb_pref_category_whitelisted_websites_summary"

+ android:title="@string/abb_pref_category_whitelisted_websites">

+ <extra

+ android:name="resource"

+ android:value="preferences_abb_whitelisted_websites"/>

+ </PreferenceScreen>

</PreferenceCategory>

<PreferenceCategory android:title="@string/abb_pref_category_exceptions"

android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" >

<PreferenceScreen android:title="@string/abb_pref_category_acceptable_ads"

android:summary="@string/abb_pref_category_acceptable_ads_summary"

android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

<extra android:name="resource"

android:value="preferences_abb_abp_acceptable_ads" />

</PreferenceScreen>

-<!-- Commented out until implemented

- <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_sites"

- android:summary="@string/abb_pref_category_whitelisted_sites_summary" >

- </PreferenceScreen>

--->

</PreferenceCategory>

</PreferenceScreen>