From c3426d0a871c958a048c5267ecab2160f1215758 Mon Sep 17 00:00:00 2001 From: YuhanYang Date: Fri, 13 Dec 2024 00:59:11 +0000 Subject: [PATCH] Add preference toggle for mouse scrolling acceleration Bug: 383555305 Bug: 384795606 Test: Local DUT with aconfig flags enabled, verified settings appears and is togglable. Verified toggle affects scrolling acceleration. Flag: com.android.hardware.input.mouse_scrolling_acceleration Change-Id: Ibba2bb1c3cb57b98ad34a5851bae7b9d73e48d74 --- res/values/strings.xml | 3 + res/xml/mouse_settings.xml | 5 + res/xml/touchpad_and_mouse_settings.xml | 6 + ...llingAccelerationPreferenceController.java | 57 ++++++++ ...gAccelerationPreferenceControllerTest.java | 122 ++++++++++++++++++ 5 files changed, 193 insertions(+) create mode 100644 src/com/android/settings/inputmethod/MouseScrollingAccelerationPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/inputmethod/MouseScrollingAccelerationPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 762288cc6f3..0b3330b17e3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4675,6 +4675,9 @@ Mouse reverse scrolling Scroll up to move the page down + + + Controlled scrolling Swap left and right buttons diff --git a/res/xml/mouse_settings.xml b/res/xml/mouse_settings.xml index 0abfdd0c364..dbd87111802 100644 --- a/res/xml/mouse_settings.xml +++ b/res/xml/mouse_settings.xml @@ -37,4 +37,9 @@ android:title="@string/mouse_pointer_acceleration" android:summary="@string/mouse_pointer_acceleration_summary" settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" /> + + diff --git a/res/xml/touchpad_and_mouse_settings.xml b/res/xml/touchpad_and_mouse_settings.xml index c470a729ccb..bc9f8427e6f 100644 --- a/res/xml/touchpad_and_mouse_settings.xml +++ b/res/xml/touchpad_and_mouse_settings.xml @@ -75,6 +75,12 @@ settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" android:order="47"/> + +