Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "InputSettings: fix touchpad tap-to-click default" into udc-qpr-dev am: bb3516fead

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23411858

Change-Id: Ic05b7e78960dbed2bf74085a1c5dead2d966a259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Harry Cutts
2023-05-26 16:37:15 +00:00
committed by Automerger Merge Worker
parent 2eb39efe3b bb3516fead
commit a1cad2339c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/input/InputSettings.java
View File

@@ -266,7 +266,7 @@ public class InputSettings {
*/ */
public static boolean useTouchpadTapToClick(@NonNull Context context) { public static boolean useTouchpadTapToClick(@NonNull Context context) {
return Settings.System.getIntForUser(context.getContentResolver(), return Settings.System.getIntForUser(context.getContentResolver(),
Settings.System.TOUCHPAD_TAP_TO_CLICK, 0, UserHandle.USER_CURRENT) == 1; Settings.System.TOUCHPAD_TAP_TO_CLICK, 1, UserHandle.USER_CURRENT) == 1;
} }
/** /**

19
services/core/java/com/android/server/input/InputSettingsObserver.java
View File

@@ -115,35 +115,34 @@ class InputSettingsObserver extends ContentObserver {
return setting != 0; return setting != 0;
} }
private int getPointerSpeedValue(String settingName) { private int constrainPointerSpeedValue(int speed) {
int speed = Settings.System.getIntForUser(mContext.getContentResolver(),
settingName, InputSettings.DEFAULT_POINTER_SPEED, UserHandle.USER_CURRENT);
return Math.min(Math.max(speed, InputSettings.MIN_POINTER_SPEED), return Math.min(Math.max(speed, InputSettings.MIN_POINTER_SPEED),
InputSettings.MAX_POINTER_SPEED); InputSettings.MAX_POINTER_SPEED);
} }
private void updateMousePointerSpeed() { private void updateMousePointerSpeed() {
mNative.setPointerSpeed(getPointerSpeedValue(Settings.System.POINTER_SPEED)); int speed = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.POINTER_SPEED, InputSettings.DEFAULT_POINTER_SPEED,
UserHandle.USER_CURRENT);
mNative.setPointerSpeed(constrainPointerSpeedValue(speed));
} }
private void updateTouchpadPointerSpeed() { private void updateTouchpadPointerSpeed() {
mNative.setTouchpadPointerSpeed( mNative.setTouchpadPointerSpeed(
getPointerSpeedValue(Settings.System.TOUCHPAD_POINTER_SPEED)); constrainPointerSpeedValue(InputSettings.getTouchpadPointerSpeed(mContext)));
} }
private void updateTouchpadNaturalScrollingEnabled() { private void updateTouchpadNaturalScrollingEnabled() {
mNative.setTouchpadNaturalScrollingEnabled( mNative.setTouchpadNaturalScrollingEnabled(
getBoolean(Settings.System.TOUCHPAD_NATURAL_SCROLLING, true)); InputSettings.useTouchpadNaturalScrolling(mContext));
} }
private void updateTouchpadTapToClickEnabled() { private void updateTouchpadTapToClickEnabled() {
mNative.setTouchpadTapToClickEnabled( mNative.setTouchpadTapToClickEnabled(InputSettings.useTouchpadTapToClick(mContext));
getBoolean(Settings.System.TOUCHPAD_TAP_TO_CLICK, true));
} }
private void updateTouchpadRightClickZoneEnabled() { private void updateTouchpadRightClickZoneEnabled() {
mNative.setTouchpadRightClickZoneEnabled( mNative.setTouchpadRightClickZoneEnabled(InputSettings.useTouchpadRightClickZone(mContext));
getBoolean(Settings.System.TOUCHPAD_RIGHT_CLICK_ZONE, false));
} }
private void updateShowTouches() { private void updateShowTouches() {