diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52fbfded282..9842843c9cd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4702,6 +4702,8 @@
Controlled scrolling
+
+ Scrolling speed
Swap primary mouse button
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" />
-
-
+
+
+
+
+
diff --git a/res/xml/touchpad_and_mouse_settings.xml b/res/xml/touchpad_and_mouse_settings.xml
index 09fdb7263ac..2fd48a981b7 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"/>
-
-
+
+
+
+
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;
+ }
+}