From 64c23fc5cf6afa5425d4bea2dab4a9efc10ee64a Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Thu, 2 Mar 2023 23:53:30 +0000 Subject: [PATCH] Revert "Add discrete contrast UI slider in the setting" This reverts commit fd3911ba29a136cb6310442d825be389d3c8fd37. Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features. Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0 --- .../preference_contrast_level_slider.xml | 104 --------------- res/values/dimens.xml | 4 - res/values/strings.xml | 6 - res/xml/accessibility_color_and_motion.xml | 5 - .../accessibility/ContrastLevelSeekBar.java | 118 ------------------ .../ContrastLevelSeekBarPreference.java | 73 ----------- .../ContrastLevelSeekBarPreferenceTest.java | 69 ---------- .../ContrastLevelSeekBarTest.java | 106 ---------------- 8 files changed, 485 deletions(-) delete mode 100644 res/layout/preference_contrast_level_slider.xml delete mode 100644 src/com/android/settings/accessibility/ContrastLevelSeekBar.java delete mode 100644 src/com/android/settings/accessibility/ContrastLevelSeekBarPreference.java delete mode 100644 tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarPreferenceTest.java delete mode 100644 tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarTest.java diff --git a/res/layout/preference_contrast_level_slider.xml b/res/layout/preference_contrast_level_slider.xml deleted file mode 100644 index 1766dd7f2ee..00000000000 --- a/res/layout/preference_contrast_level_slider.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 1bd09438e8d..57e47f2ec91 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -220,10 +220,6 @@ 20dp 27dp - - 14dp - 1dp - 16dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 28543148e14..ec6ae58c91f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4386,12 +4386,6 @@ Remove animations Reduce movement on the screen - - Contrast Level - - Standard - - High Mono audio diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml index 72c67f93778..a3135261a9a 100644 --- a/res/xml/accessibility_color_and_motion.xml +++ b/res/xml/accessibility_color_and_motion.xml @@ -64,11 +64,6 @@ android:title="@string/accessibility_toggle_large_pointer_icon_title" settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/> - -