From d5e44a0795429f5e6cfd69627c14d3eeda3cde48 Mon Sep 17 00:00:00 2001
From: YuhanYang <yyhyyh@google.com>
Date: Wed, 18 Dec 2024 17:40:37 +0000
Subject: [PATCH] Add mouse scrollling speed slide bar

Bug: 383555305
Bug: 84795606
Test: Local DUT with aconfig flags enabled, verified slide bar
      appears and can be updated.
      Verified adjusting slide bar affects scrolling speed.
Flag: com.android.hardware.input.mouse_scrolling_acceleration
Change-Id: Ia66f88ce855ab152a161ef3f81ab643415fad517
---
 res/values/strings.xml                        |  2 +
 res/xml/mouse_settings.xml                    | 19 +++--
 res/xml/touchpad_and_mouse_settings.xml       | 19 +++--
 ...useScrollingSpeedPreferenceController.java | 76 +++++++++++++++++++
 4 files changed, 105 insertions(+), 11 deletions(-)
 create mode 100644 src/com/android/settings/inputmethod/MouseScrollingSpeedPreferenceController.java

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23939822b4a..f0f41ee1217 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4678,6 +4678,8 @@
     <!-- TODO(b/383555305): finalize these strings and mark them translatable. -->
     <!-- Title for the 'Mouse controlled scrolling' preference switch, which disables the mouse scrolling acceleration so that the scrolling speed becomes directly proportional to the speed at which the wheel is turned. [CHAR LIMIT=60]-->
     <string name="mouse_scrolling_acceleration" translatable="false">Controlled scrolling</string>
+    <!-- Title for the 'Scrolling speed' slider seekbar, which controls how fast content scrolls when the user moves the scroll wheel. [CHAR LIMIT=60]-->
+    <string name="mouse_scrolling_speed" translatable="false">Scrolling speed</string>
     <!-- Title for the 'Swap buttons' preference switch, which swaps the left and right buttons of connected mice so that right click will be the primary action button and left clicking will be the secondary action, for example showing the context menu. [CHAR LIMIT=60] -->
     <string name="mouse_swap_primary_button">Swap primary mouse button</string>
     <!-- Summary text for the 'Swap buttons' preference switch indicating to users that when this switch is enabled, their left click will behave as though it is the right click (secondary action) and that the right click will be the primary action. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/mouse_settings.xml b/res/xml/mouse_settings.xml
index a25d516edbe..98a429fbe90 100644
--- a/res/xml/mouse_settings.xml
+++ b/res/xml/mouse_settings.xml
@@ -44,11 +44,6 @@
         android:summary="@string/mouse_pointer_acceleration_summary"
         settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" />
 
-    <SwitchPreferenceCompat
-        android:key="mouse_scrolling_acceleration"
-        android:title="@string/mouse_scrolling_acceleration"
-        settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />
-
     <com.android.settings.widget.SeekBarPreference
         android:key="trackpad_pointer_speed"
         android:title="@string/trackpad_pointer_speed"
@@ -64,4 +59,18 @@
         android:title="@string/accessibility_pointer_and_touchpad_title"
         android:summary="@string/accessibility_pointer_and_touchpad_summary"
         settings:searchable="true"/>
+
+    <SwitchPreferenceCompat
+        android:key="mouse_scrolling_acceleration"
+        android:title="@string/mouse_scrolling_acceleration"
+        android:order="55"
+        settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />
+
+    <com.android.settings.widget.SeekBarPreference
+        android:key="mouse_scrolling_speed"
+        android:title="@string/mouse_scrolling_speed"
+        android:order="60"
+        android:selectable="false"
+        settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>
+
 </PreferenceScreen>
diff --git a/res/xml/touchpad_and_mouse_settings.xml b/res/xml/touchpad_and_mouse_settings.xml
index bc9f8427e6f..08a2aaa864d 100644
--- a/res/xml/touchpad_and_mouse_settings.xml
+++ b/res/xml/touchpad_and_mouse_settings.xml
@@ -75,12 +75,6 @@
         settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController"
         android:order="47"/>
 
-    <SwitchPreferenceCompat
-        android:key="mouse_scrolling_acceleration"
-        android:title="@string/mouse_scrolling_acceleration"
-        settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController"
-        android:order="48"/>
-
     <Preference
         android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
         android:key="pointer_and_touchpad"
@@ -90,6 +84,19 @@
         android:summary="@string/accessibility_pointer_and_touchpad_summary"
         settings:searchable="true"/>
 
+    <SwitchPreferenceCompat
+        android:key="mouse_scrolling_acceleration"
+        android:title="@string/mouse_scrolling_acceleration"
+        settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController"
+        android:order="51"/>
+
+    <com.android.settings.widget.SeekBarPreference
+        android:key="mouse_scrolling_speed"
+        android:title="@string/mouse_scrolling_speed"
+        android:order="52"
+        android:selectable="false"
+        settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>
+
     <com.android.settingslib.widget.ButtonPreference
         android:key="trackpad_touch_gesture"
         android:title="@string/trackpad_touch_gesture"
diff --git a/src/com/android/settings/inputmethod/MouseScrollingSpeedPreferenceController.java b/src/com/android/settings/inputmethod/MouseScrollingSpeedPreferenceController.java
new file mode 100644
index 00000000000..0a57085b7d2
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseScrollingSpeedPreferenceController.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.widget.SeekBarPreference;
+
+public class MouseScrollingSpeedPreferenceController extends SliderPreferenceController {
+
+    public MouseScrollingSpeedPreferenceController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        SeekBarPreference preference = screen.findPreference(getPreferenceKey());
+        preference.setMax(getMax());
+        preference.setMin(getMin());
+        preference.setProgress(getSliderPosition());
+        updateState(preference);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!InputSettings.isMouseScrollingAccelerationFeatureFlagEnabled()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        if (position < getMin() || position > getMax()) {
+            return false;
+        }
+        InputSettings.setMouseScrollingSpeed(mContext, position);
+
+        return true;
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return InputSettings.getMouseScrollingSpeed(mContext);
+    }
+
+    @Override
+    public int getMin() {
+        return InputSettings.MIN_MOUSE_SCROLLING_SPEED;
+    }
+
+    @Override
+    public int getMax() {
+        return InputSettings.MAX_MOUSE_SCROLLING_SPEED;
+    }
+}