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

Commit d100f682 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am:... 

Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64ad am: 1cba5f9d

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



Change-Id: Ib76e6458f71282ebb7753db8c4ea9b671fb0fa19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccc55f16 1cba5f9d

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

+10 −3
Original line number Diff line number Diff line
@@ -443,10 +443,16 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
            mMainThreadHandler.removeCallbacks(mCancelRecentsAnimationRunnable);

            mMainThreadHandler.postDelayed(mCancelRecentsAnimationRunnable, 100);

        }

        cleanupAfterGesture();

        TraceHelper.INSTANCE.endSection(traceToken);

    }



    private void cleanupAfterGesture() {

        if (mVelocityTracker != null) {

            mVelocityTracker.recycle();

            mVelocityTracker = null;

        }

        mMotionPauseDetector.clear();

        TraceHelper.INSTANCE.endSection(traceToken);

    }



    @Override
@@ -471,6 +477,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
        Preconditions.assertUIThread();

        removeListener();

        mInteractionHandler = null;

        cleanupAfterGesture();

        mOnCompleteCallback.accept(this);

    }