Merge "Add mouse scrollling speed slide bar" into main (a12887ff) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -4702,6 +4702,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] -->

res/xml/mouse_settings.xml

+14 −5

Original line number	Diff line number	Diff line
		@@ -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>

res/xml/touchpad_and_mouse_settings.xml

+13 −6

Original line number	Diff line number	Diff line
		@@ -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="touchpad_touch_gesture"
		android:title="@string/trackpad_touch_gesture"

src/com/android/settings/inputmethod/MouseScrollingSpeedPreferenceController.java

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		/*
		* 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;
		}
		}