Bug 1216257 - Rename "Developer Tools" category to "Advanced" r=sebastian

--HG--
rename : mobile/android/base/resources/xml/preferences_devtools.xml => mobile/android/base/resources/xml/preferences_advanced.xml
extra : commitid : I1TDuLqfzgf
extra : rebase_source : c4cca80c6e3663efb3095b439b01063e0e128122

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

@@ -102,7 +102,6 @@
 <!ENTITY settings "Settings">
 <!ENTITY settings_title "Settings">
 <!ENTITY pref_category_input_options "Input options">
-<!ENTITY pref_category_advanced "Advanced">
 <!ENTITY pref_category_general "General">
 <!ENTITY pref_category_general_summary "Home, language, zoom, full-screen browsing">
 
@@ -171,7 +170,8 @@
      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_hint "TIP: Add any website to your list of search providers by long-pressing on its search field and then tapping the &formatI; icon.">
-<!ENTITY pref_category_devtools "Developer tools">
+<!ENTITY pref_category_advanced "Advanced">
+<!ENTITY pref_category_advanced_summary "Import, plugins, developer tools">
 <!ENTITY pref_developer_remotedebugging "Remote debugging">
 <!ENTITY pref_developer_remotedebugging_usb "Remote debugging via USB">
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
@@ -206,10 +206,10 @@
 <!ENTITY pref_header_search "Search">
 <!ENTITY pref_header_privacy_short "Privacy">
 <!ENTITY pref_header_accessibility "Accessibility">
+<!ENTITY pref_header_advanced "Advanced">
 <!ENTITY pref_header_help "Help">
 <!ENTITY pref_header_language "Language">
 <!ENTITY pref_header_vendor "&vendorShortName;">
-<!ENTITY pref_header_devtools "Developer tools">
 
 <!ENTITY pref_cookies_menu "Cookies">
 <!ENTITY pref_cookies_accept_all "Enabled">

mobile/android/base/preferences/GeckoPreferences.java

@@ -132,7 +132,7 @@ OnSharedPreferenceChangeListener
     public static final String PREFS_OPEN_URLS_IN_PRIVATE = NON_PREF_PREFIX + "openExternalURLsPrivately";
     public static final String PREFS_VOICE_INPUT_ENABLED = NON_PREF_PREFIX + "voice_input_enabled";
     public static final String PREFS_QRCODE_ENABLED = NON_PREF_PREFIX + "qrcode_enabled";
-    private static final String PREFS_DEVTOOLS = NON_PREF_PREFIX + "devtools.enabled";
+    private static final String PREFS_ADVANCED = NON_PREF_PREFIX + "advanced.enabled";
     private static final String PREFS_ACCESSIBILITY = NON_PREF_PREFIX + "accessibility.enabled";
     private static final String PREFS_CUSTOMIZE_HOME = NON_PREF_PREFIX + "customize_home";
     private static final String PREFS_CUSTOMIZE_IMAGE_BLOCKING = "browser.image_blocking.enabled";
@@ -499,7 +499,7 @@ OnSharedPreferenceChangeListener
                     // entirely. This logic will need to be extended when
                     // content language selection (Bug 881510) is implemented.
                     iterator.remove();
-                } else if (header.id == R.id.pref_header_devtools && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DEVELOPER_TOOLS)) {
+                } else if (header.id == R.id.pref_header_advanced && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DEVELOPER_TOOLS)) {
                     iterator.remove();
                 } else if (header.id == R.id.pref_header_accessibility && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DISPLAY_SETTINGS)) {
                     iterator.remove();
@@ -709,7 +709,7 @@ OnSharedPreferenceChangeListener
                         continue;
                     }
                 }
-                if (PREFS_DEVTOOLS.equals(key) &&
+                if (PREFS_ADVANCED.equals(key) &&
                     !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DEVELOPER_TOOLS)) {
                     preferences.removePreference(pref);
                     i--;

mobile/android/base/resources/xml-v11/preference_headers.xml

@@ -35,6 +35,13 @@
                android:value="preferences_accessibility"/>
     </header>
 
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:title="@string/pref_header_advanced"
+            android:id="@+id/pref_header_advanced">
+        <extra android:name="resource"
+               android:value="preferences_advanced"/>
+    </header>
+
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_language"
             android:id="@+id/pref_header_language">
@@ -48,11 +55,4 @@
                android:value="preferences_vendor"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-            android:title="@string/pref_header_devtools"
-            android:id="@+id/pref_header_devtools">
-        <extra android:name="resource"
-               android:value="preferences_devtools"/>
-    </header>
-
 </preference-headers>

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

@@ -47,6 +47,14 @@
                android:value="preferences_accessibility" />
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_advanced"
+                      android:summary="@string/pref_category_advanced_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+                      android:key="android.not_a_preference.advanced.enabled" >
+        <extra android:name="resource"
+               android:value="preferences_advanced"/>
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
@@ -61,12 +69,4 @@
                android:value="preferences_vendor"/>
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_devtools"
-                      android:summary="@string/pref_developer_remotedebugging"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-                      android:key="android.not_a_preference.devtools.enabled" >
-        <extra android:name="resource"
-               android:value="preferences_devtools"/>
-    </PreferenceScreen>
-
 </PreferenceScreen>

mobile/android/base/resources/xml/preference_headers.xml

@@ -14,7 +14,7 @@
             android:id="@+id/pref_header_language">
     </header>
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-            android:id="@+id/pref_header_devtools">
+            android:id="@+id/pref_header_advanced">
     </header>
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:id="@+id/pref_header_accessibility">

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

@@ -62,6 +62,18 @@
         </intent>
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_advanced"
+                      android:summary="@string/pref_category_advanced_summary"
+                      android:key="android.not_a_preference.advanced.enabled" >
+        <intent android:action="android.intent.action.VIEW"
+                android:targetPackage="@string/android_package_name"
+                android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
+            <extra
+                    android:name="resource"
+                    android:value="preferences_advanced" />
+        </intent>
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary" >
         <intent android:action="android.intent.action.VIEW"
@@ -83,16 +95,5 @@
                 android:value="preferences_vendor" />
         </intent>
     </PreferenceScreen>
-    <PreferenceScreen android:title="@string/pref_category_devtools"
-                      android:summary="@string/pref_developer_remotedebugging"
-	              android:key="android.not_a_preference.devtools.enabled" >
-        <intent android:action="android.intent.action.VIEW"
-                android:targetPackage="@string/android_package_name"
-                android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
-            <extra
-                android:name="resource"
-                android:value="preferences_devtools" />
-        </intent>
-    </PreferenceScreen>
 
 </PreferenceScreen>

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

@@ -5,7 +5,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/pref_category_devtools"
+                  android:title="@string/pref_category_advanced"
                   android:enabled="false">
 
        <CheckBoxPreference android:key="devtools.remote.usb.enabled"

mobile/android/base/strings.xml.in

@@ -141,7 +141,6 @@
   <string name="settings">&settings;</string>
   <string name="settings_title">&settings_title;</string>
   <string name="pref_category_input_options">&pref_category_input_options;</string>
-  <string name="pref_category_advanced">&pref_category_advanced;</string>
   <string name="pref_category_general">&pref_category_general;</string>
   <string name="pref_category_general_summary">&pref_category_general_summary;</string>
 
@@ -166,7 +165,8 @@
   <string name="pref_browser_locale">&pref_browser_locale;</string>
   <string name="locale_system_default">&locale_system_default;</string>
 
-  <string name="pref_category_devtools">&pref_category_devtools;</string>
+  <string name="pref_category_advanced">&pref_category_advanced;</string>
+  <string name="pref_category_advanced_summary">&pref_category_advanced_summary;</string>
   <string name="pref_developer_remotedebugging">&pref_developer_remotedebugging;</string>
   <string name="pref_developer_remotedebugging_usb">&pref_developer_remotedebugging_usb;</string>
   <string name="pref_developer_remotedebugging_wifi">&pref_developer_remotedebugging_wifi;</string>
@@ -192,9 +192,9 @@
   <string name="pref_header_search">&pref_header_search;</string>
   <string name="pref_header_accessibility">&pref_header_accessibility;</string>
   <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
+  <string name="pref_header_advanced">&pref_header_advanced;</string>
   <string name="pref_header_language">&pref_header_language;</string>
   <string name="pref_header_vendor">&pref_header_vendor;</string>
-  <string name="pref_header_devtools">&pref_header_devtools;</string>
 
   <string name="pref_learn_more">&pref_learn_more;</string>
 

mobile/android/base/util/UnusedResourcesUtil.java

@@ -65,7 +65,7 @@ final class UnusedResourcesUtil {
     };
 
     public static final int[] USED_IN_PREFS = {
-            R.xml.preferences_devtools,
+            R.xml.preferences_advanced,
             R.xml.preferences_accessibility,
             R.xml.preferences_home,
             R.xml.preferences_privacy,