Elevate accessibility preference to root level on all flavors
Previews on Amati and Watson:
https://screenshot.googleplex.com/6pawiGR7LovZUc4
https://screenshot.googleplex.com/3MdTCwt5EM6aaGG
Test: Manually on Amati and Watson
Bug: 227737020
Change-Id: I3f103855ba0f9af8a134d9e964f44d6e27c0da9f
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index f0a3b38..ccf1589 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -107,6 +107,8 @@
<string name="applications_category_title">Apps</string>
<!-- Title for main screen preference for device [CHAR_LIMIT_50] -->
<string name="device_pref_category_title">Device Preferences</string>
+ <!-- Title for main screen preference for accessibilty [CHAR_LIMIT_50] -->
+ <string name="accessibility_category_title">Accessibility</string>
<!-- Title for main screen preference for remote and accessories [CHAR_LIMIT_50] -->
<string name="remotes_and_accessories_category_title">Remotes & accessories</string>
<!-- Title for main screen preference for display & sound [CHAR LIMIT=50] -->
@@ -650,8 +652,6 @@
<string name="system_inputs_devices">Inputs & Devices</string>
<!-- Preference which manages home theater controls. [CHAR LIMIT=50] -->
<string name="system_home_theater_control">Home theater control</string>
- <!-- Preference which manages accessibility settings. [CHAR LIMIT=50] -->
- <string name="system_accessibility">Accessibility</string>
<!-- Preference which manages developer options. [CHAR LIMIT=50] -->
<string name="system_developer_options">Developer options</string>
<!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
diff --git a/Settings/res/xml/accessibility.xml b/Settings/res/xml/accessibility.xml
index e394e5c..bb28931 100644
--- a/Settings/res/xml/accessibility.xml
+++ b/Settings/res/xml/accessibility.xml
@@ -18,7 +18,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:key="accessibility_preference_screen"
- android:title="@string/system_accessibility">
+ android:title="@string/accessibility_category_title">
<Preference
android:key="captions"
diff --git a/Settings/res/xml/device.xml b/Settings/res/xml/device.xml
index c6f463b..b4f7eaf 100644
--- a/Settings/res/xml/device.xml
+++ b/Settings/res/xml/device.xml
@@ -117,11 +117,6 @@
android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
custom:isPreferenceVisible="false"
custom:uri="@string/overlay_internal_slice_uri"/>
- <Preference
- android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment"
- android:icon="@drawable/ic_accessibility_new"
- android:key="accessibility"
- android:title="@string/system_accessibility"/>
<com.android.tv.settings.LongClickPreference
android:icon="@drawable/ic_restart_alt"
android:key="reboot"
diff --git a/Settings/res/xml/device_restricted.xml b/Settings/res/xml/device_restricted.xml
index daed360..0b0946b 100644
--- a/Settings/res/xml/device_restricted.xml
+++ b/Settings/res/xml/device_restricted.xml
@@ -50,11 +50,6 @@
android:action="com.google.assistant.GOOGLE_SETTINGS"/>
</Preference>
<Preference
- android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment"
- android:icon="@drawable/ic_accessibility_new"
- android:key="accessibility"
- android:title="@string/system_accessibility"/>
- <Preference
android:fragment="com.android.tv.settings.system.LocationFragment"
android:icon="@drawable/ic_location_on"
android:key="location"
diff --git a/Settings/res/xml/device_two_panel.xml b/Settings/res/xml/device_two_panel.xml
index e7ed21f..8abcc8f 100644
--- a/Settings/res/xml/device_two_panel.xml
+++ b/Settings/res/xml/device_two_panel.xml
@@ -64,11 +64,6 @@
android:icon="@drawable/ic_developer_mode"
android:key="developer"
android:title="@string/system_developer_options"/>
- <Preference
- android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment"
- android:icon="@drawable/ic_accessibility_new"
- android:key="accessibility"
- android:title="@string/system_accessibility"/>
<com.android.tv.twopanelsettings.slices.SlicePreference
android:icon="@drawable/ic_internal_settings"
android:key="overlay_internal"
diff --git a/Settings/res/xml/device_vendor.xml b/Settings/res/xml/device_vendor.xml
index f26b9a1..abf2a3e 100644
--- a/Settings/res/xml/device_vendor.xml
+++ b/Settings/res/xml/device_vendor.xml
@@ -19,11 +19,6 @@
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:title="@string/device_pref_category_title">
<Preference
- android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment"
- android:icon="@drawable/ic_accessibility_new"
- android:key="accessibility"
- android:title="@string/system_accessibility"/>
- <Preference
android:fragment="com.android.tv.settings.about.AboutFragment"
android:icon="@drawable/ic_info_outline"
android:key="about_device"
diff --git a/Settings/res/xml/device_x.xml b/Settings/res/xml/device_x.xml
index 79241c1..cb92400 100644
--- a/Settings/res/xml/device_x.xml
+++ b/Settings/res/xml/device_x.xml
@@ -19,11 +19,6 @@
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:title="@string/device_pref_category_title">
<Preference
- android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment"
- android:icon="@drawable/ic_accessibility_new"
- android:key="accessibility"
- android:title="@string/system_accessibility"/>
- <Preference
android:fragment="com.android.tv.settings.about.AboutFragment"
android:icon="@drawable/ic_info_outline"
android:key="about_device"
diff --git a/Settings/res/xml/main_prefs.xml b/Settings/res/xml/main_prefs.xml
index cb2526e..c457209 100644
--- a/Settings/res/xml/main_prefs.xml
+++ b/Settings/res/xml/main_prefs.xml
@@ -70,6 +70,11 @@
android:title="@string/device_pref_category_title"
android:fragment="com.android.tv.settings.device.DevicePrefFragment" />
<Preference
+ android:icon="@drawable/ic_accessibility_new"
+ android:key="accessibility"
+ android:title="@string/accessibility_category_title"
+ android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment" />
+ <Preference
android:icon="@drawable/ic_remotes_and_accessories"
android:key="remotes_and_accessories"
android:title="@string/remotes_and_accessories_category_title"
diff --git a/Settings/res/xml/main_prefs_vendor.xml b/Settings/res/xml/main_prefs_vendor.xml
index e6fe984..75707e3 100644
--- a/Settings/res/xml/main_prefs_vendor.xml
+++ b/Settings/res/xml/main_prefs_vendor.xml
@@ -112,6 +112,11 @@
android:title="@string/device_pref_category_title"
android:fragment="com.android.tv.settings.device.DevicePrefFragment" />
<Preference
+ android:icon="@drawable/ic_accessibility_new"
+ android:key="accessibility"
+ android:title="@string/accessibility_category_title"
+ android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment" />
+ <Preference
android:icon="@drawable/ic_remotes_and_accessories"
android:key="remotes_and_accessories"
android:title="@string/remotes_and_accessories_category_title"
diff --git a/Settings/res/xml/main_prefs_x.xml b/Settings/res/xml/main_prefs_x.xml
index 5472395..6309b82 100644
--- a/Settings/res/xml/main_prefs_x.xml
+++ b/Settings/res/xml/main_prefs_x.xml
@@ -102,6 +102,11 @@
android:title="@string/device_pref_category_title"
android:fragment="com.android.tv.settings.device.DevicePrefFragment" />
<Preference
+ android:icon="@drawable/ic_accessibility_new"
+ android:key="accessibility"
+ android:title="@string/accessibility_category_title"
+ android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment" />
+ <Preference
android:icon="@drawable/ic_remotes_and_accessories"
android:key="remotes_and_accessories"
android:title="@string/remotes_and_accessories_category_title"
