[Accessibility] Migrate high text contrast under feature flag
Add Maximize Text contrast into contrast screen and hide it in "Display size and text" under feature flag
Test: manually
Bug: 241805782
Flag: aconfig
com.android.settings.accessibility.enable_color_contrast_control
Change-Id: I69049a136beba00a311c3c94fc9a49b0219a870e
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 32a3e03..3405814 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4922,6 +4922,10 @@
<string name="accessibility_toggle_high_text_contrast_preference_title">High contrast text</string>
<!-- Summary for the accessibility preference to high contrast text. [CHAR LIMIT=NONE] -->
<string name="accessibility_toggle_high_text_contrast_preference_summary">Change text color to black or white. Maximizes contrast with the background.</string>
+ <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+ <string name="accessibility_toggle_maximize_text_contrast_preference_title">Maximize text contrast</string>
+ <!-- Summary for the accessibility preference to high contrast text. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_toggle_maximize_text_contrast_preference_summary">Change text color to black or white to increase contrast with the background.</string>
<!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title">Auto
update screen magnification</string>
diff --git a/res/xml/accessibility_color_contrast.xml b/res/xml/accessibility_color_contrast.xml
index 427481e..67c939b 100644
--- a/res/xml/accessibility_color_contrast.xml
+++ b/res/xml/accessibility_color_contrast.xml
@@ -30,6 +30,14 @@
android:layout="@layout/accessibility_color_contrast_selector"
settings:controller="com.android.settings.accessibility.ContrastSelectorPreferenceController"/>
+ <SwitchPreferenceCompat
+ android:key="toggle_high_text_contrast_preference"
+ android:persistent="false"
+ android:summary="@string/accessibility_toggle_maximize_text_contrast_preference_summary"
+ android:title="@string/accessibility_toggle_maximize_text_contrast_preference_title"
+ settings:controller=
+ "com.android.settings.accessibility.HighTextContrastPreferenceController" />
+
<com.android.settings.accessibility.AccessibilityFooterPreference
android:title="@string/color_contrast_note"
android:selectable="false"
diff --git a/res/xml/accessibility_text_reading_options.xml b/res/xml/accessibility_text_reading_options.xml
index 0711a3f..795c4ffb9 100644
--- a/res/xml/accessibility_text_reading_options.xml
+++ b/res/xml/accessibility_text_reading_options.xml
@@ -57,9 +57,7 @@
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"
- settings:controller=
- "com.android.settings.accessibility.HighTextContrastPreferenceController" />
+ android:title="@string/accessibility_toggle_high_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 a90af21..5976ef5 100644
--- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -117,6 +117,11 @@
}
}
}
+
+ if (Flags.enableColorContrastControl()) {
+ // High text contrast toggle will be added inside Color Contrast page on V+.
+ removePreference(HIGH_TEXT_CONTRAST_KEY);
+ }
}
@Override
@@ -203,10 +208,12 @@
mFontWeightAdjustmentController.setEntryPoint(mEntryPoint);
controllers.add(mFontWeightAdjustmentController);
- final HighTextContrastPreferenceController highTextContrastController =
- new HighTextContrastPreferenceController(context, HIGH_TEXT_CONTRAST_KEY);
- highTextContrastController.setEntryPoint(mEntryPoint);
- controllers.add(highTextContrastController);
+ if (!Flags.enableColorContrastControl()) {
+ final HighTextContrastPreferenceController highTextContrastController =
+ new HighTextContrastPreferenceController(context, HIGH_TEXT_CONTRAST_KEY);
+ highTextContrastController.setEntryPoint(mEntryPoint);
+ controllers.add(highTextContrastController);
+ }
final TextReadingResetController resetController =
new TextReadingResetController(context, RESET_KEY,