From 8d90ba38b716111fcb7db05131c15acb48856007 Mon Sep 17 00:00:00 2001
From: marcusge <marcusge@google.com>
Date: Tue, 2 Apr 2024 00:13:17 +0000
Subject: [PATCH] [Accessibility] Restore high contrast text

Test: local raven device
Bug: 241805782

Change-Id: Ie7d807ebc46452beb69ad41ebb3e570c2ff0a186
---
 res/xml/accessibility_text_reading_options.xml    |  4 ++--
 .../TextReadingPreferenceFragment.java            | 15 ++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/res/xml/accessibility_text_reading_options.xml b/res/xml/accessibility_text_reading_options.xml
index 795c4ffb9fc..1f8c24bf192 100644
--- a/res/xml/accessibility_text_reading_options.xml
+++ b/res/xml/accessibility_text_reading_options.xml
@@ -56,8 +56,8 @@
     <SwitchPreferenceCompat
         android:key="toggle_high_text_contrast_preference"
         android:persistent="false"
-        android:summary="@string/accessibility_toggle_high_text_contrast_preference_summary"
-        android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />
+        android:summary="@string/accessibility_toggle_maximize_text_contrast_preference_summary"
+        android:title="@string/accessibility_toggle_maximize_text_contrast_preference_title" />
 
     <com.android.settings.accessibility.TextReadingResetPreference
         android:key="reset"
diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
index 5976ef51317..a90af2182f7 100644
--- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -117,11 +117,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
                 }
             }
         }
-
-        if (Flags.enableColorContrastControl()) {
-            // High text contrast toggle will be added inside Color Contrast page on V+.
-            removePreference(HIGH_TEXT_CONTRAST_KEY);
-        }
     }
 
     @Override
@@ -208,12 +203,10 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
         mFontWeightAdjustmentController.setEntryPoint(mEntryPoint);
         controllers.add(mFontWeightAdjustmentController);
 
-        if (!Flags.enableColorContrastControl()) {
-            final HighTextContrastPreferenceController highTextContrastController =
-                    new HighTextContrastPreferenceController(context, HIGH_TEXT_CONTRAST_KEY);
-            highTextContrastController.setEntryPoint(mEntryPoint);
-            controllers.add(highTextContrastController);
-        }
+        final HighTextContrastPreferenceController highTextContrastController =
+                new HighTextContrastPreferenceController(context, HIGH_TEXT_CONTRAST_KEY);
+        highTextContrastController.setEntryPoint(mEntryPoint);
+        controllers.add(highTextContrastController);
 
         final TextReadingResetController resetController =
                 new TextReadingResetController(context, RESET_KEY,