diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 6e585c367b9c..b993b21fe867 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -152,8 +152,8 @@ - - + + @@ -204,8 +204,8 @@ - + diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index 994d2a8017d4..ed213c7f2a69 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/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; diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml index 48cb652f44c4..89bccf680a92 100644 --- a/mobile/android/base/resources/xml-v11/preference_headers.xml +++ b/mobile/android/base/resources/xml-v11/preference_headers.xml @@ -22,19 +22,19 @@ android:value="preferences_search"/> -
- -
-
+
+ +
+
diff --git a/mobile/android/base/resources/xml-v11/preferences.xml b/mobile/android/base/resources/xml-v11/preferences.xml index 95f787047b1b..3c5091f829b1 100644 --- a/mobile/android/base/resources/xml-v11/preferences.xml +++ b/mobile/android/base/resources/xml-v11/preferences.xml @@ -32,15 +32,6 @@ android:value="preferences_search"/> - - - - - @@ -48,6 +39,14 @@ android:value="preferences_privacy" /> + + + + diff --git a/mobile/android/base/resources/xml/preference_headers.xml b/mobile/android/base/resources/xml/preference_headers.xml index 51285a277036..d7e4072a685d 100644 --- a/mobile/android/base/resources/xml/preference_headers.xml +++ b/mobile/android/base/resources/xml/preference_headers.xml @@ -17,6 +17,6 @@ android:id="@+id/pref_header_devtools">
+ android:id="@+id/pref_header_accessibility">
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml index 86c253385a49..ba970c1b4b3d 100644 --- a/mobile/android/base/resources/xml/preferences.xml +++ b/mobile/android/base/resources/xml/preferences.xml @@ -40,17 +40,6 @@ - - - - - - + + + + + + &pref_category_search3; &pref_category_search_summary; - &pref_category_display; - &pref_category_display_summary; + &pref_category_accessibility; + &pref_category_accessibility_summary; &pref_category_privacy_short; &pref_category_privacy_summary2; &pref_category_vendor; @@ -190,7 +190,7 @@ &pref_header_general; &pref_header_search; - &pref_header_display; + &pref_header_accessibility; &pref_header_privacy_short; &pref_header_language; &pref_header_vendor; diff --git a/mobile/android/base/util/UnusedResourcesUtil.java b/mobile/android/base/util/UnusedResourcesUtil.java index a98292dd2223..395e17da42be 100644 --- a/mobile/android/base/util/UnusedResourcesUtil.java +++ b/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, };