Side by Side Diff: mobile/android/base/resources/xml-v11/preferences_customize_tablet.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.xml ('k')
|
mobile/android/base/resources/xml/preferences.xml » ('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 <!-- Tablet only: The contents under the "Customize" header for tablets, | 6 <!-- Tablet only: The contents under the "Customize" header for tablets, |
| 7 See xml-v11/preferences.xml for single-pane v11+ phone layout. | 7 See xml-v11/preferences.xml for single-pane v11+ phone layout. |
| 8 Changes to preferences should be mirrored to preferences_customize.xml. --> | 8 Changes to preferences should be mirrored to preferences_customize.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:title="@string/pref_category_customize" | 12 android:title="@string/pref_category_customize" |
| 13 android:enabled="false"> | 13 android:enabled="false"> |
| 14 | 14 |
| 15 <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_pre ference.sync" | 15 <!-- Removed SyncPreference. See https://issues.adblockplus.org/ticket/2474 --> |
| 16 android:title="@string/pref_sy nc" | |
| 17 android:persistent="false" /> | |
| 18 | 16 |
| 19 <PreferenceScreen android:key="android.not_a_preference.customize_home" | 17 <PreferenceScreen android:key="android.not_a_preference.customize_home" |
| 20 android:title="@string/pref_category_home" | 18 android:title="@string/pref_category_home" |
| 21 android:summary="@string/pref_category_home_summary" | 19 android:summary="@string/pref_category_home_summary" |
| 22 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 20 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 23 <extra android:name="resource" | 21 <extra android:name="resource" |
| 24 android:value="preferences_home" /> | 22 android:value="preferences_home" /> |
| 25 </PreferenceScreen> | 23 </PreferenceScreen> |
| 26 | 24 |
| 27 <PreferenceScreen android:title="@string/pref_category_search" | 25 <PreferenceScreen android:title="@string/pref_category_search" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 android:persistent="false" /> | 58 android:persistent="false" /> |
| 61 | 59 |
| 62 <ListPreference android:key="app.update.autodownload" | 60 <ListPreference android:key="app.update.autodownload" |
| 63 android:title="@string/pref_update_autodownload" | 61 android:title="@string/pref_update_autodownload" |
| 64 android:entries="@array/pref_update_autodownload_entries" | 62 android:entries="@array/pref_update_autodownload_entries" |
| 65 android:entryValues="@array/pref_update_autodownload_values" | 63 android:entryValues="@array/pref_update_autodownload_values" |
| 66 android:persistent="false" /> | 64 android:persistent="false" /> |
| 67 | 65 |
| 68 </PreferenceScreen> | 66 </PreferenceScreen> |
| 69 | 67 |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/xml-v11/preferences.xml ('k')
|
mobile/android/base/resources/xml/preferences.xml » ('j')
|
no next file with comments »
