Side by Side Diff: mobile/android/base/resources/xml-v11/preference_headers.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/values/colors.xml ('k')
|
mobile/android/base/resources/xml-v11/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: Sync is nested within the "Customize" header on tablets, | 6 <!-- Tablet only: Sync is nested within the "Customize" header on tablets, |
| 7 instead of being a top-level menu item. | 7 instead of being a top-level menu item. |
| 8 See xml-v11/preferences.xml for single-pane v11+ phone layout. --> | 8 See xml-v11/preferences.xml for single-pane v11+ phone layout. --> |
| 9 | 9 |
| 10 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> | 10 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 android:value="preferences_display"/> | 22 android:value="preferences_display"/> |
| 23 </header> | 23 </header> |
| 24 | 24 |
| 25 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" | 25 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" |
| 26 android:title="@string/pref_header_privacy_short"> | 26 android:title="@string/pref_header_privacy_short"> |
| 27 <extra android:name="resource" | 27 <extra android:name="resource" |
| 28 android:value="preferences_privacy"/> | 28 android:value="preferences_privacy"/> |
| 29 </header> | 29 </header> |
| 30 | 30 |
| 31 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" | 31 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" |
| 32 android:title="@string/abb_pref_header_adblocking"> | |
| 33 <extra android:name="resource" | |
| 34 android:value="preferences_abb_abp"/> | |
| 35 </header> | |
| 36 | |
| 37 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" | |
| 32 android:title="@string/pref_header_language" | 38 android:title="@string/pref_header_language" |
| 33 android:id="@+id/pref_header_language"> | 39 android:id="@+id/pref_header_language"> |
| 34 <extra android:name="resource" | 40 <extra android:name="resource" |
| 35 android:value="preferences_locale" /> | 41 android:value="preferences_locale" /> |
| 36 </header> | 42 </header> |
| 37 | 43 |
| 38 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" | 44 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" |
| 39 android:title="@string/pref_header_vendor"> | 45 android:title="@string/pref_header_vendor"> |
| 40 <extra android:name="resource" | 46 <extra android:name="resource" |
| 41 android:value="preferences_vendor"/> | 47 android:value="preferences_vendor"/> |
| 42 </header> | 48 </header> |
| 43 | 49 |
| 44 <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragm ent" | 50 <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2475 --> |
| 45 android:title="@string/pref_header_devtools" | |
| 46 android:id="@+id/pref_header_devtools"> | |
| 47 <extra android:name="resource" | |
| 48 android:value="preferences_devtools"/> | |
| 49 </header> | |
| 50 | 51 |
| 51 </preference-headers> | 52 </preference-headers> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/values/colors.xml ('k')
|
mobile/android/base/resources/xml-v11/preferences.xml » ('j')
|
no next file with comments »
