From 753b476a39612b338165ff7c6508f3611c446f29 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Thu, 29 Aug 2024 15:43:03 +0000 Subject: [PATCH] Move pointer and touchpad customization settings to their own pages. Bug: 269100659 Test: PointerTouchpadFragmentTest Test: PointerTouchpadPreferenceControllerTest Flag: android.view.flags.enable_vector_cursor_a11y_settings Change-Id: I0dccf48f9b5416ad8e6d3c263188d4bb850f69e9 --- res/drawable/ic_pointer_and_touchpad.xml | 35 +++++++ res/values/strings.xml | 10 +- res/xml/accessibility_color_and_motion.xml | 11 --- .../accessibility_pointer_and_touchpad.xml | 48 ++++++++++ ...essibility_pointer_color_customization.xml | 34 +++++++ res/xml/accessibility_settings.xml | 10 ++ res/xml/accessibility_tap_assistance.xml | 8 -- res/xml/trackpad_settings.xml | 29 ++---- .../PointerColorCustomizationFragment.java | 59 ++++++++++++ .../inputmethod/PointerTouchpadFragment.java | 58 ++++++++++++ .../PointerTouchpadPreferenceController.java | 39 ++++++++ .../PointerTouchpadFragmentTest.java | 51 +++++++++++ ...interTouchpadPreferenceControllerTest.java | 91 +++++++++++++++++++ 13 files changed, 440 insertions(+), 43 deletions(-) create mode 100644 res/drawable/ic_pointer_and_touchpad.xml create mode 100644 res/xml/accessibility_pointer_and_touchpad.xml create mode 100644 res/xml/accessibility_pointer_color_customization.xml create mode 100644 src/com/android/settings/inputmethod/PointerColorCustomizationFragment.java create mode 100644 src/com/android/settings/inputmethod/PointerTouchpadFragment.java create mode 100644 src/com/android/settings/inputmethod/PointerTouchpadPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/inputmethod/PointerTouchpadFragmentTest.java create mode 100644 tests/robotests/src/com/android/settings/inputmethod/PointerTouchpadPreferenceControllerTest.java diff --git a/res/drawable/ic_pointer_and_touchpad.xml b/res/drawable/ic_pointer_and_touchpad.xml new file mode 100644 index 00000000000..c077900c44c --- /dev/null +++ b/res/drawable/ic_pointer_and_touchpad.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3494afd56ff..22708041c7f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4532,8 +4532,8 @@ Click in the bottom right corner of the touchpad for more options Pointer speed - - Pointer fill style + + Pointer color Change pointer fill style to black @@ -4810,6 +4810,12 @@ Display Color and motion + + Pointer & touchpad accessibility + + Pointer color, pointer size & more + + Pointer color customization Color contrast diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml index 4c4490ca5c6..a500b72d958 100644 --- a/res/xml/accessibility_color_and_motion.xml +++ b/res/xml/accessibility_color_and_motion.xml @@ -72,17 +72,6 @@ android:title="@string/accessibility_toggle_large_pointer_icon_title" settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/> - - + + + + + + + + + + + diff --git a/res/xml/accessibility_pointer_color_customization.xml b/res/xml/accessibility_pointer_color_customization.xml new file mode 100644 index 00000000000..6d767b423f3 --- /dev/null +++ b/res/xml/accessibility_pointer_color_customization.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 65617756524..18e645591ff 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -110,6 +110,16 @@ settings:keywords="@string/keywords_vibration" android:summary="@string/accessibility_vibration_settings_summary"/> + + - - \ No newline at end of file diff --git a/res/xml/trackpad_settings.xml b/res/xml/trackpad_settings.xml index 935de82f79d..7e9494476fe 100644 --- a/res/xml/trackpad_settings.xml +++ b/res/xml/trackpad_settings.xml @@ -62,29 +62,14 @@ android:selectable="false" settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/> - - - - - + android:persistent="false" + android:title="@string/accessibility_pointer_and_touchpad_title" + android:summary="@string/accessibility_pointer_and_touchpad_summary" + settings:searchable="true"/>