mobile/android/base/resources/xml-v11/preferences_abb_abp.xml - Issue 29342912: Issue 3070 - Create Adblock Plus on/off switch

Delta Between Two Patch Sets: mobile/android/base/resources/xml-v11/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/locales/adblockbrowser/en-US/android_strings.dtd ('k') | mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

LEFT	RIGHT
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"
anton 2016/09/30 07:18:21 i can see previously `android:title` was the first i can see previously `android:title` was the first attribute so consider reordering to make it first again for better readability diegocarloslima 2016/10/26 12:34:17 I've just looked into our sources and it seems tha Show quoted text On 2016/09/30 07:18:21, anton wrote: > i can see previously `android:title` was the first attribute so consider > reordering to make it first again for better readability I've just looked into our sources and it seems that it has a pattern regarding the order of precedence of the attributes in preferences xml, that would be: 1) android:key 2) android:title 3) android:summary 4) android:defaultValue 5) android:persistent 6) android:dependency So I'll upload a patch set with the above ordering :)
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"

	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 the first again? reorder to make 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 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >	19 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >

19 <extra android:name="resource"	20 <extra android:name="resource"

20 android:value="preferences_abb_adblocking" />	21 android:value="preferences_abb_adblocking" />

21 </PreferenceScreen>	22 </PreferenceScreen>

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

23 android:summary="@string/abb_pref_category_more_blocki ng_summary"	24 android:summary="@string/abb_pref_category_more_blocki ng_summary"

24 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >	25 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >

25 <extra android:name="resource"	26 <extra android:name="resource"

26 android:value="preferences_abb_more_blocking" />	27 android:value="preferences_abb_more_blocking" />

27 </PreferenceScreen>	28 </PreferenceScreen>

28 </PreferenceCategory>	29 </PreferenceCategory>

29	30

30 <PreferenceCategory android:dependency="android.not_a_preference.adblockbrow ser.apiAdblockPlusEnabled"	31 <PreferenceCategory android:title="@string/abb_pref_category_exceptions"

31 android:title="@string/abb_pref_category_exceptions">	32 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" >
anton 2016/09/30 07:18:21 reorder to make the first again? reorder to make the first again?
32 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s"	33 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s"

33 android:summary="@string/abb_pref_category_acceptable_ ads_summary"	34 android:summary="@string/abb_pref_category_acceptable_ ads_summary"

34 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >	35 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" >

35 <extra android:name="resource"	36 <extra android:name="resource"

36 android:value="preferences_abb_abp_acceptable_ads" />	37 android:value="preferences_abb_abp_acceptable_ads" />

37 </PreferenceScreen>	38 </PreferenceScreen>

38 <!-- Commented out until implemented	39 <!-- Commented out until implemented

39 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites"	40 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites"

40 android:summary="@string/abb_pref_category_whitelisted _sites_summary" >	41 android:summary="@string/abb_pref_category_whitelisted _sites_summary" >

41 </PreferenceScreen>	42 </PreferenceScreen>

42 -->	43 -->

43 </PreferenceCategory>	44 </PreferenceCategory>

44	45

45 </PreferenceScreen>	46 </PreferenceScreen>

46	47

LEFT	RIGHT