Merge "[Accessibility] Restore high contrast text" into main (c3f57aa3) · Commits · e / os / android_packages_apps_Settings

res/xml/accessibility_text_reading_options.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -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"

+4 −11

Original line number	Diff line number	Diff line
		@@ -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 TextReadingResetController resetController =
		new TextReadingResetController(context, RESET_KEY,