| commit | e7dd70c5222854024b874db76e6594ed169f8e2d | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sun Jun 13 21:39:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jun 13 21:39:21 2021 +0000 |
| tree | db29d82a26155eea30c688c732a4ed1dd6e78e75 | |
| parent | 650fa8139aff3aed0cb16835e6ae734940ec60b5 [diff] | |
| parent | 302a3df29a99e995f03e2a63ffd602e5f835f58b [diff] |
Merge "Ensure we pass the pointer id to the velocity tracker and not the index" into sc-dev am: be2a0989ce am: 302a3df29a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940326 Change-Id: I68c4e8a61a012f4f1bee3f91e9459c5f20de3cec
diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java index 8151d41..1ed2da3 100644 --- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java +++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -121,7 +121,7 @@ mForcePauseTimeout.setAlarm(mMakePauseHarderToTrigger ? HARDER_TRIGGER_TIMEOUT : FORCE_PAUSE_TIMEOUT); - float newVelocity = mVelocityProvider.addMotionEvent(ev, pointerIndex); + float newVelocity = mVelocityProvider.addMotionEvent(ev, ev.getPointerId(pointerIndex)); if (mPreviousVelocity != null) { checkMotionPaused(newVelocity, mPreviousVelocity, ev.getEventTime()); }