Unified Diff: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml
Issue 29322610:
Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)
Patch Set:
Created July 17, 2015, 6:47 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/resources/layout/abb_url_input_dialog.xml ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| diff --git a/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml b/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| index eaf8c2b473829da2f8914dd071e538c249a461bb..514b3218de29c27b635405786363594273232c63 100644 |
| --- a/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| +++ b/mobile/android/base/resources/xml-v11/preferences_abb_abp.xml |
| @@ -4,8 +4,7 @@ |
| - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| - xmlns:gecko="http://schemas.android.com/apk/res-auto" |
| - android:enabled="false"> |
| + xmlns:gecko="http://schemas.android.com/apk/res-auto" > |
| <PreferenceCategory android:title="@string/abb_pref_category_blocking"> |
| <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| @@ -14,11 +13,12 @@ |
| <extra android:name="resource" |
| android:value="preferences_abb_adblocking" /> |
| </PreferenceScreen> |
| -<!-- Commented out until implemented |
| <PreferenceScreen android:title="@string/abb_pref_category_further_blocking" |
| - android:summary="@string/abb_pref_category_further_blocking_summary" > |
| + android:summary="@string/abb_pref_category_further_blocking_summary" |
| + android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| + <extra android:name="resource" |
| + android:value="preferences_abb_further_blocking" /> |
| </PreferenceScreen> |
| ---> |
| </PreferenceCategory> |
| <PreferenceCategory android:title="@string/abb_pref_category_exceptions"> |
« no previous file with comments
|
« mobile/android/base/resources/layout/abb_url_input_dialog.xml ('k')
|
mobile/android/base/resources/xml/preferences_abb_abp.xml » ('j')
|
no next file with comments »
