Bug 698593 - (1/3) Reorganize and clean up the Android preferences screen [r=sriram]

--HG--
extra : rebase_source : 218f65b9f6c763d63fa1628cae7ebda291dcbe19

mobile/android/app/mobile.js

@@ -414,12 +414,6 @@ pref("browser.ui.kinetic.exponentialC", 1400);
 pref("browser.ui.kinetic.polynomialC", 100);
 pref("browser.ui.kinetic.swipeLength", 160);
 
-// zooming
-pref("browser.ui.zoom.pageFitGranularity", 9); // don't zoom to fit by less than 1/9 (11%)
-pref("browser.ui.zoom.animationDuration", 200); // ms duration of double-tap zoom animation
-pref("browser.ui.zoom.reflow", false); // Change text wrapping on double-tap
-pref("browser.ui.zoom.reflow.fontSize", 720);
-
 pref("font.size.inflation.minTwips", 120);
 
 // pinch gesture
@@ -565,7 +559,6 @@ pref("services.sync.autoconnectDelay", 5);
 pref("services.sync.prefs.sync.browser.startup.homepage.title", true);
 pref("services.sync.prefs.sync.browser.startup.homepage", true);
 pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true);
-pref("services.sync.prefs.sync.browser.ui.zoom.reflow", true);
 pref("services.sync.prefs.sync.devtools.errorconsole.enabled", true);
 pref("services.sync.prefs.sync.javascript.enabled", true);
 pref("services.sync.prefs.sync.lightweightThemes.isThemeSelected", true);

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

@@ -45,8 +45,10 @@
 
 <!ENTITY preferences "Preferences">
 <!ENTITY preferences_title "Preferences">
+<!ENTITY pref_category_general "General">
 <!ENTITY pref_category_privacy "Privacy &amp; Security">
 <!ENTITY pref_category_content "Content">
+<!ENTITY pref_about_firefox "About &brandShortName;">
 <!ENTITY pref_do_not_track "Tell sites not to track me">
 <!ENTITY pref_telemetry "Send performance data">
 <!ENTITY pref_homepage "Home page">
@@ -56,9 +58,6 @@
 <!ENTITY pref_remember_signons "Remember passwords">
 <!ENTITY pref_locale "Language">
 <!ENTITY pref_cookies "Enable cookies">
-<!ENTITY pref_zoom_reflow "Reformat text on zoom">
-<!ENTITY pref_show_images "Show images">
-<!ENTITY pref_enable_js "Enable JavaScript">
 <!ENTITY pref_char_encoding "Show character encoding">
 <!ENTITY pref_clear_history "Clear history">
 <!ENTITY pref_clear_history_confirm "Browsing history will be deleted">

mobile/android/base/resources/xml/preferences.xml

@@ -3,20 +3,23 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                         android:enabled="false">
 
+    <PreferenceCategory android:title="@string/pref_category_general">
+        <!-- TODO: About Firefox -->
+
+        <!-- TODO: Default Search Engine -->
+
+        <!--ListPreference     android:key="general.useragent.locale"
+                            android:title="@string/pref_locale"
+                            android:defaultValue=""
+                            android:entries="@array/pref_homepage_entries"
+                            android:entryValues="@array/pref_homepage_values"
+                            android:persistent="false" /-->
+
+        <!-- TODO: Sync -->
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/pref_category_content">
 
-        <CheckBoxPreference android:key="browser.ui.zoom.reflow"
-                            android:title="@string/pref_zoom_reflow"
-                            android:persistent="false" />
-
-        <CheckBoxPreference android:key="permissions.default.image"
-                            android:title="@string/pref_show_images"
-                            android:persistent="false" />
-
-        <CheckBoxPreference android:key="javascript.enabled"
-                            android:title="@string/pref_enable_js"
-                            android:persistent="false" />
-
         <CheckBoxPreference android:key="browser.menu.showCharacterEncoding"
                             android:title="@string/pref_char_encoding"
                             android:persistent="false" />
@@ -27,13 +30,6 @@
                             android:entries="@array/pref_homepage_entries"
                             android:entryValues="@array/pref_homepage_values"
                             android:persistent="false" />
-
-        <!--ListPreference     android:key="general.useragent.locale"
-                            android:title="@string/pref_locale"
-                            android:defaultValue=""
-                            android:entries="@array/pref_homepage_entries"
-                            android:entryValues="@array/pref_homepage_values"
-                            android:persistent="false" /-->
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_privacy">

mobile/android/base/strings.xml.in

@@ -51,8 +51,10 @@
 
   <string name="preferences">&preferences;</string>
   <string name="preferences_title">&preferences_title;</string>
+  <string name="pref_category_general">&pref_category_general;</string>
   <string name="pref_category_privacy">&pref_category_privacy;</string>
   <string name="pref_category_content">&pref_category_content;</string>
+  <string name="pref_about_firefox">&pref_about_firefox;</string>
   <string name="pref_do_not_track">&pref_do_not_track;</string>
   <string name="pref_telemetry">&pref_telemetry;</string>
   <string name="pref_homepage">&pref_homepage;</string>
@@ -62,9 +64,6 @@
   <string name="pref_remember_signons">&pref_remember_signons;</string>
   <string name="pref_locale">&pref_locale;</string>
   <string name="pref_cookies">&pref_cookies;</string>
-  <string name="pref_zoom_reflow">&pref_zoom_reflow;</string>
-  <string name="pref_show_images">&pref_show_images;</string>
-  <string name="pref_enable_js">&pref_enable_js;</string>
   <string name="pref_char_encoding">&pref_char_encoding;</string>
   <string name="pref_clear_history">&pref_clear_history;</string>
   <string name="pref_clear_history_confirm">&pref_clear_history_confirm;</string>