Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f37111e authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Ignore touch slop threshold for trackpad gestures using gesture nav"... 

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

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



Change-Id: Ie8ad90ddb686f684cdb424e0f7c74f05bca1a31c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db88f858 17f50eb8

quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

+4 −3
Original line number Diff line number Diff line
@@ -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;