Bug 1216257 - Rename "Display" category to "Accessibility" r=sebastian

--HG--
rename : mobile/android/base/resources/xml/preferences_display.xml => mobile/android/base/resources/xml/preferences_accessibility.xml
extra : commitid : CotJQcAlqN6
extra : rebase_source : ca8fb8c6c45dadf175fa483322637a5eb3f1026f

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

@@ -152,8 +152,8 @@
 
 <!ENTITY pref_category_search3 "Search">
 <!ENTITY pref_category_search_summary "Customize your search providers">
-<!ENTITY pref_category_display "Display">
+<!ENTITY pref_category_accessibility "Accessibility">
-<!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
+<!ENTITY pref_category_accessibility_summary "Text size, voice input">
 <!ENTITY pref_category_privacy_short "Privacy">
 <!ENTITY pref_category_privacy_summary2 "Control logins, cookies, tracking, data">
 <!ENTITY pref_category_vendor "&vendorShortName;">
@@ -204,8 +204,8 @@
 <!-- Localization note: These are shown in the left sidebar on tablets -->
 <!ENTITY pref_header_general "General">
 <!ENTITY pref_header_search "Search">
-<!ENTITY pref_header_display "Display">
 <!ENTITY pref_header_privacy_short "Privacy">
+<!ENTITY pref_header_accessibility "Accessibility">
 <!ENTITY pref_header_help "Help">
 <!ENTITY pref_header_language "Language">
 <!ENTITY pref_header_vendor "&vendorShortName;">

mobile/android/base/preferences/GeckoPreferences.java

@@ -133,7 +133,7 @@ OnSharedPreferenceChangeListener
     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_DISPLAY = NON_PREF_PREFIX + "display.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";
     private static final String PREFS_TRACKING_PROTECTION_PRIVATE_BROWSING = "privacy.trackingprotection.pbmode.enabled";
@@ -501,7 +501,7 @@ OnSharedPreferenceChangeListener
                     iterator.remove();
                 } else if (header.id == R.id.pref_header_devtools && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DEVELOPER_TOOLS)) {
                     iterator.remove();
-                } else if (header.id == R.id.pref_header_display && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DISPLAY_SETTINGS)) {
+                } else if (header.id == R.id.pref_header_accessibility && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DISPLAY_SETTINGS)) {
                     iterator.remove();
                 }
             }
@@ -715,7 +715,7 @@ OnSharedPreferenceChangeListener
                     i--;
                     continue;
                 }
-                if (PREFS_DISPLAY.equals(key) && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DISPLAY_SETTINGS)) {
+                if (PREFS_ACCESSIBILITY.equals(key) && !RestrictedProfiles.isAllowed(this, Restriction.DISALLOW_DISPLAY_SETTINGS)) {
                     preferences.removePreference(pref);
                     i--;
                     continue;

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

@@ -22,19 +22,19 @@
                android:value="preferences_search"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-            android:title="@string/pref_header_display"
-            android:id="@+id/pref_header_display">
-        <extra android:name="resource"
-               android:value="preferences_display"/>
-    </header>
-
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_privacy_short">
         <extra android:name="resource"
                android:value="preferences_privacy"/>
     </header>
 
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:title="@string/pref_header_accessibility"
+            android:id="@+id/pref_header_accessibility">
+        <extra android:name="resource"
+               android:value="preferences_accessibility"/>
+    </header>
+
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_language"
             android:id="@+id/pref_header_language">

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

@@ -32,15 +32,6 @@
                android:value="preferences_search"/>
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_display"
-                      android:summary="@string/pref_category_display_summary"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-                      android:key="android.not_a_preference.display.enabled" >
-        <extra android:name="resource"
-               android:value="preferences_display" />
-    </PreferenceScreen>
-
-
     <PreferenceScreen android:title="@string/pref_category_privacy_short"
                       android:summary="@string/pref_category_privacy_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
@@ -48,6 +39,14 @@
                android:value="preferences_privacy" />
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_accessibility"
+                      android:summary="@string/pref_category_accessibility_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+                      android:key="android.not_a_preference.accessibility.enabled" >
+        <extra android:name="resource"
+               android:value="preferences_accessibility" />
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

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

@@ -17,6 +17,6 @@
             android:id="@+id/pref_header_devtools">
     </header>
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-            android:id="@+id/pref_header_display">
+            android:id="@+id/pref_header_accessibility">
     </header>
 </preference-headers>

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

@@ -40,17 +40,6 @@
         </intent>
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_display"
-                      android:summary="@string/pref_category_display_summary" >
-        <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_display" />
-        </intent>
-    </PreferenceScreen>
-
     <PreferenceScreen android:title="@string/pref_category_privacy_short"
                       android:summary="@string/pref_category_privacy_summary" >
         <intent android:action="android.intent.action.VIEW"
@@ -62,6 +51,17 @@
         </intent>
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_accessibility"
+                      android:summary="@string/pref_category_accessibility_summary" >
+        <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_accessibility" />
+        </intent>
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary" >
         <intent android:action="android.intent.action.VIEW"

mobile/android/base/resources/xml/preferences_accessibility.xml

@@ -4,8 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_accessibility"
-                  android:title="@string/pref_category_display"
                   android:enabled="false">
 
     <org.mozilla.gecko.preferences.FontSizePreference

mobile/android/base/strings.xml.in

@@ -147,8 +147,8 @@
 
   <string name="pref_category_search">&pref_category_search3;</string>
   <string name="pref_category_search_summary">&pref_category_search_summary;</string>
-  <string name="pref_category_display">&pref_category_display;</string>
+  <string name="pref_category_accessibility">&pref_category_accessibility;</string>
-  <string name="pref_category_display_summary">&pref_category_display_summary;</string>
+  <string name="pref_category_accessibility_summary">&pref_category_accessibility_summary;</string>
   <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
   <string name="pref_category_privacy_summary">&pref_category_privacy_summary2;</string>
   <string name="pref_category_vendor">&pref_category_vendor;</string>
@@ -190,7 +190,7 @@
 
   <string name="pref_header_general">&pref_header_general;</string>
   <string name="pref_header_search">&pref_header_search;</string>
-  <string name="pref_header_display">&pref_header_display;</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_language">&pref_header_language;</string>
   <string name="pref_header_vendor">&pref_header_vendor;</string>

mobile/android/base/util/UnusedResourcesUtil.java

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