| commit | 302a3df29a99e995f03e2a63ffd602e5f835f58b | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sun Jun 13 21:31:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jun 13 21:31:07 2021 +0000 |
| tree | 6af7081d78b7be014f1e9d48a1a57fbcaa261fc2 | |
| parent | 225e6ba272d98be7232717536b306cee2bbd97f3 [diff] | |
| parent | be2a0989ce2dd97b6dc414d9c29456c6064c039e [diff] |
Merge "Ensure we pass the pointer id to the velocity tracker and not the index" into sc-dev am: be2a0989ce Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940326 Change-Id: I0ec916b62730bf129588b97f676da55893861487
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()); }