Side by Side Diff: mobile/android/base/resources/xml/preferences_abb_abp.xml
Issue 29492590:
Issue 5432 - No android_package_name string resource found (Closed)
Patch Set:
Created July 19, 2017, 4:06 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/resources/xml-v11/preferences_abb_abp.xml ('k')
|
no next file »
|
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 <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" > |
|
diegocarloslima
2017/07/19 16:12:02
There are some indentation adjustments required in
| |
| 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 <intent android:action="android.intent.action.VIEW" | 19 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 20 android:targetPackage="@string/android_package_name" | 20 <extra android:name="resource" |
| 21 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > | 21 android:value="preferences_abb_adblocking" /> |
| 22 <extra android:name="resource" | |
| 23 android:value="preferences_abb_adblocking" /> | |
| 24 </intent> | |
| 25 </PreferenceScreen> | 22 </PreferenceScreen> |
| 26 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " | 23 <PreferenceScreen android:title="@string/abb_pref_category_more_blocking " |
| 27 android:summary="@string/abb_pref_category_more_blocki ng_summary" > | 24 android:summary="@string/abb_pref_category_more_blocki ng_summary" |
| 28 <intent android:action="android.intent.action.VIEW" | 25 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 29 android:targetPackage="@string/android_package_name" | 26 <extra android:name="resource" |
| 30 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > | 27 android:value="preferences_abb_more_blocking" /> |
| 31 <extra android:name="resource" | |
| 32 android:value="preferences_abb_more_blocking" /> | |
| 33 </intent> | |
| 34 </PreferenceScreen> | 28 </PreferenceScreen> |
| 35 </PreferenceCategory> | 29 </PreferenceCategory> |
| 30 | |
| 36 <PreferenceCategory android:title="@string/abb_pref_category_exceptions" | 31 <PreferenceCategory android:title="@string/abb_pref_category_exceptions" |
| 37 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > | 32 android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPl usEnabled" > |
| 38 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" | 33 <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ad s" |
| 39 android:summary="@string/abb_pref_category_acceptable_ ads_summary" > | 34 android:summary="@string/abb_pref_category_acceptable_ ads_summary" |
| 40 <intent android:action="android.intent.action.VIEW" | 35 android:fragment="org.mozilla.gecko.preferences.GeckoP referenceFragment" > |
| 41 android:targetPackage="@string/android_package_name" | 36 <extra android:name="resource" |
| 42 android:targetClass="org.mozilla.gecko.preferences.GeckoPr eferences" > | 37 android:value="preferences_abb_abp_acceptable_ads" /> |
| 43 <extra android:name="resource" | |
| 44 android:value="preferences_abb_abp_acceptable_ads" /> | |
| 45 </intent> | |
| 46 </PreferenceScreen> | 38 </PreferenceScreen> |
| 47 <!-- Commented out until implemented | 39 <!-- Commented out until implemented |
| 48 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" | 40 <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_s ites" |
| 49 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > | 41 android:summary="@string/abb_pref_category_whitelisted _sites_summary" > |
| 50 </PreferenceScreen> | 42 </PreferenceScreen> |
| 51 --> | 43 --> |
| 52 </PreferenceCategory> | 44 </PreferenceCategory> |
| 53 | 45 |
| 54 </PreferenceScreen> | 46 </PreferenceScreen> |
| 55 | 47 |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/xml-v11/preferences_abb_abp.xml ('k')
|
no next file »
|
no next file with comments »
