diff options
author | Tony Wickham <twickham@google.com> | 2022-06-16 14:55:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-16 14:55:48 +0000 |
commit | 9d5f64adf1dbdc2dbe3983cf542b8ef4767c03ec (patch) | |
tree | 1ee96737d32bb11a521a8bce3ba076b0371efebb /quickstep | |
parent | 5d57e3d651920a075e7ba2df9a865543d12f64df (diff) | |
parent | a379435d0436576b93facb7d9b6e3b15e45d0ab6 (diff) | |
download | Launcher3-9d5f64adf1dbdc2dbe3983cf542b8ef4767c03ec.tar.gz |
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 11f0ff3259..e458c1f022 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -425,12 +425,18 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC mMainThreadHandler.removeCallbacks(mCancelRecentsAnimationRunnable); mMainThreadHandler.postDelayed(mCancelRecentsAnimationRunnable, 100); } - mVelocityTracker.recycle(); - mVelocityTracker = null; - mMotionPauseDetector.clear(); + cleanupAfterGesture(); TraceHelper.INSTANCE.endSection(traceToken); } + private void cleanupAfterGesture() { + if (mVelocityTracker != null) { + mVelocityTracker.recycle(); + mVelocityTracker = null; + } + mMotionPauseDetector.clear(); + } + @Override public void notifyOrientationSetup() { mRotationTouchHelper.onStartGesture(); @@ -453,6 +459,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC Preconditions.assertUIThread(); removeListener(); mInteractionHandler = null; + cleanupAfterGesture(); mOnCompleteCallback.accept(this); } |