commit 05c94ca802589de9c1051119ead79f557e3aad2d
author Winson Chung <winsonc@google.com> Sun Jun 13 21:29:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Jun 13 21:29:49 2021 +0000
tree 395f1c7661e57a7c37d32bfa52c9dbb3b52de48b
parent fb2c9ddd0cc7f599d81151a4c087b2bde1dcc014
parent be2a0989ce2dd97b6dc414d9c29456c6064c039e

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: I0c9401633f2c2fc75b5e90be4f2ff316963ed70b

quickstep/src/com/android/quickstep/util/MotionPauseDetector.java

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());
         }