Side by Side 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.
| 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_customize_tablet.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 <!-- Preferences screen for pre-v11 Android devices that do not support | 6 <!-- Preferences screen for pre-v11 Android devices that do not support |
| 7 PreferenceFragment or ActionBar. Preference changes here should be mirrored | 7 PreferenceFragment or ActionBar. Preference changes here should be mirrored |
| 8 to xml-v11/preferences.xml. --> | 8 to xml-v11/preferences.xml. --> |
| 9 | 9 |
| 10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" | 10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| 11 xmlns:gecko="http://schemas.android.com/apk/res-auto" | 11 xmlns:gecko="http://schemas.android.com/apk/res-auto" |
| 12 android:enabled="false"> | 12 android:enabled="false"> |
| 13 | 13 |
| 14 <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_pre ference.sync" | |
| 15 android:title="@string/pref_sy nc" | |
| 16 android:summary="@string/pref_ sync_summary" | |
| 17 android:persistent="false" /> | |
| 18 | |
| 19 <PreferenceScreen android:title="@string/pref_category_customize" | 14 <PreferenceScreen android:title="@string/pref_category_customize" |
| 20 android:summary="@string/pref_category_customize_summary" | 15 android:summary="@string/pref_category_customize_summary" |
| 21 android:key="android.not_a_preference.customize_screen"> | 16 android:key="android.not_a_preference.customize_screen"> |
| 22 <intent android:action="android.intent.action.VIEW" | 17 <intent android:action="android.intent.action.VIEW" |
| 23 android:targetPackage="@string/android_package_name" | 18 android:targetPackage="@string/android_package_name" |
| 24 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | 19 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > |
| 25 <extra | 20 <extra |
| 26 android:name="resource" | 21 android:name="resource" |
| 27 android:value="preferences_customize" /> | 22 android:value="preferences_customize" /> |
| 28 </intent> | 23 </intent> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 43 android:summary="@string/pref_category_privacy_summary" > | 38 android:summary="@string/pref_category_privacy_summary" > |
| 44 <intent android:action="android.intent.action.VIEW" | 39 <intent android:action="android.intent.action.VIEW" |
| 45 android:targetPackage="@string/android_package_name" | 40 android:targetPackage="@string/android_package_name" |
| 46 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | 41 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > |
| 47 <extra | 42 <extra |
| 48 android:name="resource" | 43 android:name="resource" |
| 49 android:value="preferences_privacy" /> | 44 android:value="preferences_privacy" /> |
| 50 </intent> | 45 </intent> |
| 51 </PreferenceScreen> | 46 </PreferenceScreen> |
| 52 | 47 |
| 48 <!-- Adblocking preferences --> | |
| 49 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" | |
| 50 android:summary="@string/abb_pref_category_adblocking_summ ary_main" > | |
| 51 <intent android:action="android.intent.action.VIEW" | |
| 52 android:targetPackage="@string/android_package_name" | |
| 53 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | |
| 54 <extra | |
| 55 android:name="resource" | |
| 56 android:value="preferences_abb_abp" /> | |
| 57 </intent> | |
| 58 </PreferenceScreen> | |
| 59 | |
| 53 <PreferenceScreen android:title="@string/pref_category_language" | 60 <PreferenceScreen android:title="@string/pref_category_language" |
| 54 android:summary="@string/pref_category_language_summary" > | 61 android:summary="@string/pref_category_language_summary" > |
| 55 <intent android:action="android.intent.action.VIEW" | 62 <intent android:action="android.intent.action.VIEW" |
| 56 android:targetPackage="@string/android_package_name" | 63 android:targetPackage="@string/android_package_name" |
| 57 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | 64 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > |
| 58 <extra | 65 <extra |
| 59 android:name="resource" | 66 android:name="resource" |
| 60 android:value="preferences_locale" /> | 67 android:value="preferences_locale" /> |
| 61 </intent> | 68 </intent> |
| 62 </PreferenceScreen> | 69 </PreferenceScreen> |
| 63 | 70 |
| 64 <PreferenceScreen android:title="@string/pref_category_vendor" | 71 <PreferenceScreen android:title="@string/pref_category_vendor" |
| 65 android:summary="@string/pref_category_vendor_summary" > | 72 android:summary="@string/pref_category_vendor_summary" > |
| 66 <intent android:action="android.intent.action.VIEW" | 73 <intent android:action="android.intent.action.VIEW" |
| 67 android:targetPackage="@string/android_package_name" | 74 android:targetPackage="@string/android_package_name" |
| 68 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | 75 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > |
| 69 <extra | 76 <extra |
| 70 android:name="resource" | 77 android:name="resource" |
| 71 android:value="preferences_vendor" /> | 78 android:value="preferences_vendor" /> |
| 72 </intent> | 79 </intent> |
| 73 </PreferenceScreen> | 80 </PreferenceScreen> |
| 81 <<<<<<< local | |
| 82 | |
| 83 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 --> | |
| 84 ======= | |
| 74 <PreferenceScreen android:title="@string/pref_category_devtools" | 85 <PreferenceScreen android:title="@string/pref_category_devtools" |
| 75 android:summary="@string/pref_developer_remotedebugging" | 86 android:summary="@string/pref_developer_remotedebugging" |
| 76 android:key="android.not_a_preference.devtools.enabled" > | 87 android:key="android.not_a_preference.devtools.enabled" > |
| 77 <intent android:action="android.intent.action.VIEW" | 88 <intent android:action="android.intent.action.VIEW" |
| 78 android:targetPackage="@string/android_package_name" | 89 android:targetPackage="@string/android_package_name" |
| 79 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > | 90 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferen ces" > |
| 80 <extra | 91 <extra |
| 81 android:name="resource" | 92 android:name="resource" |
| 82 android:value="preferences_devtools" /> | 93 android:value="preferences_devtools" /> |
| 83 </intent> | 94 </intent> |
| 84 </PreferenceScreen> | 95 </PreferenceScreen> |
| 96 >>>>>>> other | |
| 85 | 97 |
| 86 </PreferenceScreen> | 98 </PreferenceScreen> |
| OLD | NEW |
« 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 »
