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