Delta Between Two Patch Sets: mobile/android/base/resources/xml-v11/preferences.xml
Issue 4920541991403520:
Create a minimal settings UI (Closed)
Left Patch Set: Cleanup of AddOnBridge
Created March 22, 2015, 12:13 p.m.
Right Patch Set: Removed default case
Created March 22, 2015, 9:23 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/moz.build ('k')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 <!-- Phone v11+ only: Sync is a top-level menu item. | 6 <!-- Phone v11+ only: Sync is a top-level menu item. |
| 7 See xml-v11/preference_headers.xml for tablet layout. | 7 See xml-v11/preference_headers.xml for tablet layout. |
| 8 Preference changes here should be mirrored to xml/preferences.xml.in. --> | 8 Preference changes here should be mirrored to xml/preferences.xml.in. --> |
| 9 | 9 |
| 10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" | 10 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 android:value="preferences_display" /> | 27 android:value="preferences_display" /> |
| 28 </PreferenceScreen> | 28 </PreferenceScreen> |
| 29 | 29 |
| 30 | 30 |
| 31 <PreferenceScreen android:title="@string/pref_category_privacy_short" | 31 <PreferenceScreen android:title="@string/pref_category_privacy_short" |
| 32 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 32 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 33 <extra android:name="resource" | 33 <extra android:name="resource" |
| 34 android:value="preferences_privacy" /> | 34 android:value="preferences_privacy" /> |
| 35 </PreferenceScreen> | 35 </PreferenceScreen> |
| 36 | 36 |
| 37 <!-- Adblock Plus Browser preferences --> | 37 <!-- Adblocking preferences --> |
|
Felix Dahlke
2015/03/22 13:52:34
"Adblocking preferences", I'd say.
René Jeschke
2015/03/22 15:32:59
Done.
| |
| 38 <PreferenceScreen android:title="@string/abp_pref_category_adblocking" | 38 <PreferenceScreen android:title="@string/abb_pref_category_adblocking" |
|
Felix Dahlke
2015/03/22 13:52:34
So you're planning to prefix all of our strings wi
René Jeschke
2015/03/22 15:32:59
Because abp is shorter, but, ok, will use 'adblock
| |
| 39 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 39 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 40 <extra android:name="resource" | 40 <extra android:name="resource" |
| 41 android:value="preferences_abp_adblockplus" /> | 41 android:value="preferences_abb_abp" /> |
|
Felix Dahlke
2015/03/22 13:52:34
Why not "preferences_adblocking"?
René Jeschke
2015/03/22 15:32:59
Because we have a sub-preference that is called 'A
Felix Dahlke
2015/03/22 15:51:45
Doesn't really make sense - these are the adblocki
| |
| 42 </PreferenceScreen> | 42 </PreferenceScreen> |
| 43 | 43 |
| 44 <PreferenceScreen android:title="@string/pref_category_language" | 44 <PreferenceScreen android:title="@string/pref_category_language" |
| 45 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 45 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 46 <extra android:name="resource" | 46 <extra android:name="resource" |
| 47 android:value="preferences_locale" /> | 47 android:value="preferences_locale" /> |
| 48 </PreferenceScreen> | 48 </PreferenceScreen> |
| 49 | 49 |
| 50 <PreferenceScreen android:title="@string/pref_category_vendor" | 50 <PreferenceScreen android:title="@string/pref_category_vendor" |
| 51 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 51 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 52 <extra android:name="resource" | 52 <extra android:name="resource" |
| 53 android:value="preferences_vendor"/> | 53 android:value="preferences_vendor"/> |
| 54 </PreferenceScreen> | 54 </PreferenceScreen> |
| 55 | 55 |
| 56 <PreferenceScreen android:title="@string/pref_category_devtools" | 56 <PreferenceScreen android:title="@string/pref_category_devtools" |
| 57 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > | 57 android:fragment="org.mozilla.gecko.preferences.GeckoPrefe renceFragment" > |
| 58 <extra android:name="resource" | 58 <extra android:name="resource" |
| 59 android:value="preferences_devtools"/> | 59 android:value="preferences_devtools"/> |
| 60 </PreferenceScreen> | 60 </PreferenceScreen> |
| 61 | 61 |
| 62 </PreferenceScreen> | 62 </PreferenceScreen> |
| LEFT | RIGHT |
« mobile/android/base/moz.build ('k')
|
mobile/android/base/resources/xml-v11/preferences_abb_abp.xml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
