Bug 1216257 - Rearrange privacy prefs to match spec. r=sebastian

--HG--
extra : commitid : Li0bHhI54uh
extra : rebase_source : c70f80da7a29012ca9468b3ed096ee371bdb5fc9

mobile/android/base/locales/en-US/android_strings.dtd

@@ -176,7 +176,6 @@
 <!ENTITY pref_developer_remotedebugging_usb "Remote debugging via USB">
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
 <!ENTITY pref_developer_remotedebugging_wifi_disabled_summary "Wi-Fi debugging requires your device to have a QR code reader app installed.">
-<!ENTITY pref_category_logins "Logins">
 <!ENTITY pref_remember_signons2 "Remember logins">
 <!ENTITY pref_open_external_urls_privately_title "Open links in Private browsing">
 <!ENTITY pref_open_external_urls_privately_summary "For all external links opened in &brandShortName;">

mobile/android/base/resources/xml/preferences_privacy.xml

@@ -8,6 +8,17 @@
                   android:title="@string/pref_category_privacy_short"
                   android:enabled="false">
 
+    <CheckBoxPreference android:key="privacy.donottrackheader.enabled"
+                        android:title="@string/pref_donottrack_title"
+                        android:summary="@string/pref_donottrack_summary"
+                        android:persistent="false" />
+
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference
+            android:key="android.not_a_preference.donottrackheader.learn_more"
+            android:title="@string/pref_learn_more"
+            android:persistent="false"
+            url="https://www.mozilla.org/firefox/dnt/" />
+
     <CheckBoxPreference android:key="privacy.trackingprotection.pbmode.enabled"
                         android:title="@string/pref_tracking_protection_title"
                         android:summary="@string/pref_tracking_protection_summary"
@@ -25,38 +36,23 @@
             android:persistent="false"
             url="https://support.mozilla.org/kb/firefox-android-tracking-protection" />
 
-    <CheckBoxPreference android:key="privacy.donottrackheader.enabled"
-                        android:title="@string/pref_donottrack_title"
-                        android:summary="@string/pref_donottrack_summary"
-                        android:persistent="false" />
-
-    <org.mozilla.gecko.preferences.AlignRightLinkPreference
-            android:key="android.not_a_preference.donottrackheader.learn_more"
-            android:title="@string/pref_learn_more"
-            android:persistent="false"
-            url="https://www.mozilla.org/firefox/dnt/" />
-
     <ListPreference android:key="network.cookie.cookieBehavior"
                     android:title="@string/pref_cookies_menu"
                     android:entries="@array/pref_cookies_entries"
                     android:entryValues="@array/pref_cookies_values"
                     android:persistent="false" />
 
-    <PreferenceCategory android:title="@string/pref_category_logins">
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
+                                                  android:title="@string/pref_manage_logins"
+                                                  url="about:logins"/>
 
-        <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
+    <CheckBoxPreference android:key="signon.rememberSignons"
-                                                      android:title="@string/pref_manage_logins"
+                        android:title="@string/pref_remember_signons"
-                                                      url="about:logins"/>
+                        android:persistent="false" />
 
-        <CheckBoxPreference android:key="signon.rememberSignons"
+    <CheckBoxPreference android:key="privacy.masterpassword.enabled"
-                            android:title="@string/pref_remember_signons"
+                        android:title="@string/pref_use_master_password"
-                            android:persistent="false" />
+                        android:persistent="false" />
-
-        <CheckBoxPreference android:key="privacy.masterpassword.enabled"
-                            android:title="@string/pref_use_master_password"
-                            android:persistent="false" />
-
-    </PreferenceCategory>
 
 
     <!-- This pref is persisted in both Gecko and Java -->

mobile/android/base/strings.xml.in

@@ -197,7 +197,6 @@
 
   <string name="pref_learn_more">&pref_learn_more;</string>
 
-  <string name="pref_category_logins">&pref_category_logins;</string>
   <string name="pref_remember_signons">&pref_remember_signons2;</string>
 
   <string name="pref_open_external_urls_privately_title">&pref_open_external_urls_privately_title;</string>