Unified Diff: mobile/android/base/resources/xml/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/preferences_customize_tablet.xml ('k')
|
mobile/android/base/strings.xml.in » ('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/preferences.xml |
| diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml |
| index bc6ab806558c34113432a8e1b3a2b9b87895fe48..47921f6da087f77b2e55a273f2fc5388dc6e9e5a 100644 |
| --- a/mobile/android/base/resources/xml/preferences.xml |
| +++ b/mobile/android/base/resources/xml/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"> |
| @@ -50,6 +45,18 @@ |
| </intent> |
| </PreferenceScreen> |
| + <!-- Adblocking preferences --> |
| + <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
| + android:summary="@string/abb_pref_category_adblocking_summary_main" > |
| + <intent android:action="android.intent.action.VIEW" |
| + android:targetPackage="@string/android_package_name" |
| + android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" > |
| + <extra |
| + android:name="resource" |
| + android:value="preferences_abb_abp" /> |
| + </intent> |
| + </PreferenceScreen> |
| + |
| <PreferenceScreen android:title="@string/pref_category_language" |
| android:summary="@string/pref_category_language_summary" > |
| <intent android:action="android.intent.action.VIEW" |
| @@ -71,6 +78,10 @@ |
| android:value="preferences_vendor" /> |
| </intent> |
| </PreferenceScreen> |
| +<<<<<<< local |
| + |
| + <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 --> |
| +======= |
| <PreferenceScreen android:title="@string/pref_category_devtools" |
| android:summary="@string/pref_developer_remotedebugging" |
| android:key="android.not_a_preference.devtools.enabled" > |
| @@ -82,5 +93,6 @@ |
| android:value="preferences_devtools" /> |
| </intent> |
| </PreferenceScreen> |
| +>>>>>>> other |
| </PreferenceScreen> |
« no previous file with comments
|
« mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml ('k')
|
mobile/android/base/strings.xml.in » ('j')
|
no next file with comments »
