Unified Diff: mobile/android/base/resources/xml-v11/preferences.xml
Issue 29330952:
Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set:
Created Nov. 26, 2015, 11:01 a.m.
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/preference_headers.xml ('k')
|
mobile/android/base/resources/xml-v11/preferences_customize_tablet.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.xml |
| diff --git a/mobile/android/base/resources/xml-v11/preferences.xml b/mobile/android/base/resources/xml-v11/preferences.xml |
| index 3497d45692444144f42b5677a62b5c6ae269fb39..79be47daf444693aabaa3301ac03ba9eae781a03 100644 |
| --- a/mobile/android/base/resources/xml-v11/preferences.xml |
| +++ b/mobile/android/base/resources/xml-v11/preferences.xml |
| @@ -11,11 +11,6 @@ |
| xmlns:gecko="http://schemas.android.com/apk/res-auto" |
| android:enabled="false"> |
| - <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync" |
| - android:title="@string/pref_sync" |
| - android:summary="@string/pref_sync_summary" |
| - android:persistent="false" /> |
| - |
| <PreferenceScreen android:title="@string/pref_category_customize" |
| android:summary="@string/pref_category_customize_summary" |
| android:key="android.not_a_preference.customize_screen" |
| @@ -40,6 +35,14 @@ |
| android:value="preferences_privacy" /> |
| </PreferenceScreen> |
| + <!-- Adblocking preferences --> |
| + <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| + android:summary="@string/abb_pref_category_adblocking_summary_main" |
| + android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| + <extra android:name="resource" |
| + android:value="preferences_abb_abp" /> |
| + </PreferenceScreen> |
| + |
| <PreferenceScreen android:title="@string/pref_category_language" |
| android:summary="@string/pref_category_language_summary" |
| android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| @@ -54,12 +57,6 @@ |
| android:value="preferences_vendor"/> |
| </PreferenceScreen> |
| - <PreferenceScreen android:title="@string/pref_category_devtools" |
| - android:summary="@string/pref_developer_remotedebugging" |
| - android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" |
| - android:key="android.not_a_preference.devtools.enabled" > |
| - <extra android:name="resource" |
| - android:value="preferences_devtools"/> |
| - </PreferenceScreen> |
| + <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 --> |
| </PreferenceScreen> |
« no previous file with comments
|
« mobile/android/base/resources/xml-v11/preference_headers.xml ('k')
|
mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml » ('j')
|
no next file with comments »
