Bug 1261137 - Add "Data usage" group in Settings > Advanced. r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Thu, 31 Mar 2016 20:19:32 +0200
changeset 346280 8f03892327e66fafaead6f772e3cd7a2042b27e1
parent 346279 ac7287caed61a3e39172c740921fa0f8e1a0811a
child 517400 80dc9a81afde295483ba0a5c41c0212c41c4ba59
push id14326
push users.kaspari@gmail.com
push dateThu, 31 Mar 2016 18:23:05 +0000
reviewersahunt
bugs1261137
milestone48.0a1
Bug 1261137 - Add "Data usage" group in Settings > Advanced. r?ahunt MozReview-Commit-ID: EyCVU2iMB75
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences_advanced.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -152,16 +152,17 @@
 <!ENTITY pref_category_datareporting "Data choices">
 <!ENTITY pref_category_logins "Logins">
 <!ENTITY pref_learn_more "Learn more">
 <!ENTITY pref_category_installed_search_engines "Installed search engines">
 <!ENTITY pref_category_add_search_providers "Add more search providers">
 <!ENTITY pref_category_search_restore_defaults "Restore search engines">
 <!ENTITY pref_search_restore_defaults "Restore defaults">
 <!ENTITY pref_search_restore_defaults_summary "Restore defaults">
+<!ENTITY pref_category_data_usage "Data usage">
 <!-- Localization note (pref_search_hint) : "TIP" as in "hint", "clue" etc. Displayed as an
      advisory message on the customise search providers settings page explaining how to add new
      search providers.
      The &formatI; in the string will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. -->
 <!ENTITY pref_search_hint2 "TIP: Add any website to your list of search providers by long-pressing on its search field and then touching the &formatI; icon.">
 <!ENTITY pref_category_advanced "Advanced">
 <!ENTITY pref_category_advanced_summary2 "Restore tabs, plugins, developer tools">
--- a/mobile/android/base/resources/xml/preferences_advanced.xml
+++ b/mobile/android/base/resources/xml/preferences_advanced.xml
@@ -27,25 +27,16 @@
 
     <ListPreference android:key="android.not_a_preference.restoreSession3"
                     android:title="@string/pref_restore"
                     android:defaultValue="quit"
                     android:entries="@array/pref_restore_entries"
                     android:entryValues="@array/pref_restore_values"
                     android:persistent="true" />
 
-    <ListPreference android:key="browser.image_blocking"
-                    android:title="@string/pref_tap_to_load_images_title2"
-                    android:entries="@array/pref_browser_image_blocking_entries"
-                    android:entryValues="@array/pref_browser_image_blocking_values"
-                    android:persistent="false" />
-
-    <CheckBoxPreference android:key="browser.display.use_document_fonts"
-                        android:title="@string/pref_show_web_fonts" />
-
     <ListPreference android:key="plugin.enable"
                     android:title="@string/pref_plugins"
                     android:entries="@array/pref_plugins_entries"
                     android:entryValues="@array/pref_plugins_values"
                     android:persistent="false" />
 
     <SwitchPreference android:key="media.autoplay.enabled"
                       android:title="@string/pref_media_autoplay_enabled"
@@ -64,9 +55,22 @@
     <SwitchPreference android:key="devtools.remote.wifi.enabled"
                       android:title="@string/pref_developer_remotedebugging_wifi" />
 
     <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
                                                             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 android:title="@string/pref_category_data_usage">
+
+        <ListPreference android:key="browser.image_blocking"
+            android:title="@string/pref_tap_to_load_images_title2"
+            android:entries="@array/pref_browser_image_blocking_entries"
+            android:entryValues="@array/pref_browser_image_blocking_values"
+            android:persistent="false" />
+
+        <CheckBoxPreference android:key="browser.display.use_document_fonts"
+            android:title="@string/pref_show_web_fonts" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -148,16 +148,17 @@
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
   <string name="pref_category_logins">&pref_category_logins;</string>
   <string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
   <string name="pref_category_add_search_providers">&pref_category_add_search_providers;</string>
   <string name="pref_category_search_restore_defaults">&pref_category_search_restore_defaults;</string>
   <string name="pref_search_restore_defaults">&pref_search_restore_defaults;</string>
   <string name="pref_search_restore_defaults_summary">&pref_search_restore_defaults_summary;</string>
   <string name="pref_search_hint">&pref_search_hint2;</string>
+  <string name="pref_category_data_usage">&pref_category_data_usage;</string>
 
   <string name="pref_category_language">&pref_category_language;</string>
   <string name="pref_category_language_summary">&pref_category_language_summary;</string>
   <string name="pref_browser_locale">&pref_browser_locale;</string>
   <string name="locale_system_default">&locale_system_default;</string>
 
   <string name="pref_category_advanced">&pref_category_advanced;</string>
   <string name="pref_category_advanced_summary">&pref_category_advanced_summary2;</string>