Merge "Ignore touch slop threshold for trackpad gestures using gesture nav" into udc-qpr-dev am: 17f50eb8a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24542608

Change-Id: Ie8ad90ddb686f684cdb424e0f7c74f05bca1a31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2023-08-25 05:23:35 +00:00
committed by Automerger Merge Worker

View File

@@ -278,7 +278,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
if (!mIsDeferredDownTarget) {
// Normal gesture, ensure we pass the drag slop before we start tracking
// the gesture
if (Math.abs(displacement) > mTouchSlop) {
if (mGestureState.isTrackpadGesture() || Math.abs(displacement)
> mTouchSlop) {
mPassedWindowMoveSlop = true;
mStartDisplacement = Math.min(displacement, -mTouchSlop);
}
@@ -287,8 +288,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
float horizontalDist = Math.abs(displacementX);
float upDist = -displacement;
boolean passedSlop = squaredHypot(displacementX, displacementY)
>= mSquaredTouchSlop;
boolean passedSlop = mGestureState.isTrackpadGesture() || squaredHypot(
displacementX, displacementY) >= mSquaredTouchSlop;
if (!mPassedSlopOnThisGesture && passedSlop) {
mPassedSlopOnThisGesture = true;