From 5f04aa0c527434fa67af88833f8c7c58a247f8c2 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Mon, 8 Mar 2021 15:40:16 +0800
Subject: [PATCH] Update accessibility settings layout

Accessibility settings category restructure
1. Add Color Inversion into Text and Display page
2. Move High contrast text to the last item
3. Move Dark theme and Reduce Brightness to the top Accessibility page
4. Remove the turn screen darker entry point

Bug: 174829936
Test: atest AccessibilitySettingsTest
Change-Id: I3e0c222d57e49db3a551010fa7dc1c7b5b3a9e2c
---
 res/xml/accessibility_text_and_display.xml | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
index bd30e61928d..26b119f8c5b 100644
--- a/res/xml/accessibility_text_and_display.xml
+++ b/res/xml/accessibility_text_and_display.xml
@@ -42,13 +42,6 @@
         android:title="@string/force_bold_text"
         settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
 
-    <Preference
-        android:fragment="com.android.settings.accessibility.TurnScreenDarkerFragment"
-        android:key="turn_screen_darker_preference_screen"
-        android:persistent="false"
-        android:title="@string/accessibility_turn_screen_darker_title"
-        settings:searchable="true"/>
-
     <Preference
         android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
         android:icon="@drawable/ic_daltonizer"
@@ -57,11 +50,13 @@
         android:title="@string/accessibility_display_daltonizer_preference_title"
         settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
 
-    <SwitchPreference
-        android:key="toggle_high_text_contrast_preference"
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
+        android:icon="@drawable/ic_color_inversion"
+        android:key="toggle_inversion_preference"
         android:persistent="false"
-        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
-        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+        android:title="@string/accessibility_display_inversion_preference_title"
+        settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
 
     <SwitchPreference
         android:key="toggle_disable_animations"
@@ -75,9 +70,15 @@
         android:title="@string/accessibility_toggle_large_pointer_icon_title"
         settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
 
+    <SwitchPreference
+        android:key="toggle_high_text_contrast_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+
     <PreferenceCategory
         android:key="experimental_category"
         android:persistent="false"
         android:title="@string/experimental_category_title">
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>