commit 3a5adb5d8bcc0b050d73931ea90a59402080173e
author Wenxin Feng <wenxinfeng@google.com> Sat May 06 09:39:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 06 09:39:13 2023 +0000
tree de794f2474b88c372de04483a08264eccb52271c
parent 927eeff365d5a6ae161938e45afe27725afcfcce
parent d591db8bf9ccbd41041f0f9166dcdf889ad61498

Merge "Align the scroll ballistics with the pointing ballistics." into udc-dev am: e34ee30493 am: d591db8bf9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23001990

Change-Id: I77459e87ee911714f11174bbc846afe868414e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/inputflinger/reader/mapper/TouchpadInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp b/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
index a5da3cd..c72425a 100644
--- a/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
@@ -270,6 +270,14 @@
         accelCurveProp.setRealValues(
                 createAccelerationCurveForSensitivity(config.touchpadPointerSpeed,
                                                       accelCurveProp.getCount()));
+        mPropertyProvider.getProperty("Use Custom Touchpad Scroll Accel Curve")
+                .setBoolValues({true});
+        GesturesProp scrollCurveProp = mPropertyProvider.getProperty("Scroll Accel Curve");
+        scrollCurveProp.setRealValues(
+                createAccelerationCurveForSensitivity(config.touchpadPointerSpeed,
+                                                      scrollCurveProp.getCount()));
+        mPropertyProvider.getProperty("Scroll X Out Scale").setRealValues({1.0});
+        mPropertyProvider.getProperty("Scroll Y Out Scale").setRealValues({1.0});
         mPropertyProvider.getProperty("Invert Scrolling")
                 .setBoolValues({config.touchpadNaturalScrollingEnabled});
         mPropertyProvider.getProperty("Tap Enable")