Bug 811285 - Reorder checkbox list items in settings. r=mleibovic
authorTetsuharu OHZEKI <saneyuki.s.snyk@gmail.com>
Thu, 15 Nov 2012 20:34:57 -0500
changeset 113453 e57ef5cb5b18ac476af4fd3198dc797fa27649e3
parent 113452 c794e4ef27fc9ed4ba45aa9cc3a0d13afa582895
child 113454 ab4286df7900eaa6d0d7437479b7ecb38dcc8697
push id18158
push userryanvm@gmail.com
push dateFri, 16 Nov 2012 01:34:59 +0000
treeherdermozilla-inbound@90c362bfd156 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmleibovic
bugs811285
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 811285 - Reorder checkbox list items in settings. r=mleibovic
mobile/android/base/resources/xml/preferences.xml.in
--- a/mobile/android/base/resources/xml/preferences.xml.in
+++ b/mobile/android/base/resources/xml/preferences.xml.in
@@ -52,16 +52,22 @@
                         android:title="@string/pref_reflow_on_zoom"
                         android:defaultValue="false"
                         android:persistent="false" />
 
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_privacy">
 
+        <ListPreference android:key="network.cookie.cookieBehavior"
+                        android:title="@string/pref_cookies"
+                        android:entries="@array/pref_cookies_entries"
+                        android:entryValues="@array/pref_cookies_values"
+                        android:persistent="false" />
+
         <!-- keys prefixed with "android.not_a_preference." are not synced with Gecko -->
         <org.mozilla.gecko.PrivateDataPreference
                             android:key="android.not_a_preference.privacy.clear"
                             android:title="@string/pref_clear_private_data"
                             android:persistent="true"
                             android:positiveButtonText="@string/button_clear_data"
                             gecko:entries="@array/pref_private_data_entries"
                             gecko:entryKeys="@array/pref_private_data_keys"
@@ -72,43 +78,37 @@
                             android:defaultValue="false"
                             android:persistent="false" />
 
         <CheckBoxPreference android:key="signon.rememberSignons"
                             android:title="@string/pref_remember_signons"
                             android:defaultValue="true"
                             android:persistent="false" />
 
-        <ListPreference android:key="network.cookie.cookieBehavior"
-                        android:title="@string/pref_cookies"
-                        android:entries="@array/pref_cookies_entries"
-                        android:entryValues="@array/pref_cookies_values"
-                        android:persistent="false" />
+        <CheckBoxPreference android:key="privacy.masterpassword.enabled"
+                            android:title="@string/pref_use_master_password"
+                            android:defaultValue="false"
+                            android:persistent="false" />
+
+        <CheckBoxPreference android:key="browser.search.suggest.enabled"
+                            android:title="@string/pref_search_suggestions"
+                            android:defaultValue="true"
+                            android:persistent="false" />
 
 #ifdef MOZ_TELEMETRY_REPORTING
         <CheckBoxPreference android:key="toolkit.telemetry.enabled"
                             android:title="@string/pref_telemetry"
                             android:persistent="false" />
 #endif
 
-        <CheckBoxPreference android:key="privacy.masterpassword.enabled"
-                            android:title="@string/pref_use_master_password"
-                            android:defaultValue="false"
-                            android:persistent="false" />
-
         <CheckBoxPreference android:key="android.not_a_preference.privacy.announcements.enabled"
                             android:title="@string/pref_show_product_announcements"
                             android:defaultValue="true"
                             android:persistent="true" />
 
-        <CheckBoxPreference android:key="browser.search.suggest.enabled"
-                            android:title="@string/pref_search_suggestions"
-                            android:defaultValue="true"
-                            android:persistent="false" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_importexport">
 
       <org.mozilla.gecko.AndroidImportPreference
           android:key="android.not_a_preference.import_android"
           gecko:entries="@array/pref_import_android_entries"
           gecko:entryKeys="@array/pref_import_android_keys"