Bug 1261137 - Add groups in Settings > Advanced. r=sebastian

MozReview-Commit-ID: 2jUL0PJ33bq

--HG--
extra : rebase_source : b715458d0ab6dd137e42467f98ed6a94ffa719c1

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

@@ -219,6 +219,10 @@
 <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party">
 <!ENTITY pref_cookies_disabled "Disabled">
 
+<!ENTITY pref_category_data_saver "Data saver">
+<!ENTITY pref_category_media "Media">
+<!ENTITY pref_category_developer_tools "Developer tools">
+
 <!ENTITY pref_tap_to_load_images_title2 "Show images">
 <!ENTITY pref_tap_to_load_images_enabled "Always">
 <!ENTITY pref_tap_to_load_images_data "Only over Wi-Fi">

mobile/android/base/resources/xml/preferences_advanced.xml

@@ -32,6 +32,14 @@
                     android:entryValues="@array/pref_restore_values"
                     android:persistent="true" />
 
+    <ListPreference android:key="browser.menu.showCharacterEncoding"
+                    android:title="@string/pref_char_encoding"
+                    android:entries="@array/pref_char_encoding_entries"
+                    android:entryValues="@array/pref_char_encoding_values"
+                    android:persistent="false" />
+
+    <PreferenceCategory android:title="@string/pref_category_data_saver">
+
         <ListPreference android:key="browser.image_blocking"
                         android:title="@string/pref_tap_to_load_images_title2"
                         android:entries="@array/pref_browser_image_blocking_entries"
@@ -42,6 +50,10 @@
                           android:title="@string/pref_show_web_fonts"
                           android:summary="@string/pref_show_web_fonts_summary"/>
 
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_category_media">
+
         <ListPreference android:key="plugin.enable"
                         android:title="@string/pref_plugins"
                         android:entries="@array/pref_plugins_entries"
@@ -52,16 +64,13 @@
                           android:title="@string/pref_media_autoplay_enabled"
                           android:summary="@string/pref_media_autoplay_enabled_summary" />
 
-    <ListPreference android:key="browser.menu.showCharacterEncoding"
-                    android:title="@string/pref_char_encoding"
-                    android:entries="@array/pref_char_encoding_entries"
-                    android:entryValues="@array/pref_char_encoding_values"
-                    android:persistent="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_category_developer_tools">
 
         <SwitchPreference android:key="devtools.remote.usb.enabled"
                           android:title="@string/pref_developer_remotedebugging_usb" />
 
-
         <SwitchPreference android:key="devtools.remote.wifi.enabled"
                           android:title="@string/pref_developer_remotedebugging_wifi" />
 
@@ -69,5 +78,6 @@
                                                                 android:title="@string/pref_learn_more"
                                                                 android:persistent="false"
                                                                 url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
+    </PreferenceCategory>
 
 </PreferenceScreen>

mobile/android/base/strings.xml.in

@@ -203,6 +203,10 @@
   <string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string>
   <string name="pref_cookies_disabled">&pref_cookies_disabled;</string>
 
+  <string name="pref_category_data_saver">&pref_category_data_saver;</string>
+  <string name="pref_category_media">&pref_category_media;</string>
+  <string name="pref_category_developer_tools">&pref_category_developer_tools;</string>
+
   <string name="pref_tap_to_load_images_title2">&pref_tap_to_load_images_title2;</string>
   <string name="pref_tap_to_load_images_enabled">&pref_tap_to_load_images_enabled;</string>
   <string name="pref_tap_to_load_images_data">&pref_tap_to_load_images_data;</string>