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 @@ 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 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"/> - - + + + + 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; + } +}