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

Commit 7af9bae4 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Clean up RemoteTargetHandles when RecentsAnimation ends" into sc-v2-dev am: 6e5f4e31 

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

Change-Id: I67b67494303063640223e2dca971a6d2e24d614f
parents 436a73d2 6e5f4e31

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+4 −1
Original line number Diff line number Diff line
@@ -1736,7 +1736,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        endLauncherTransitionController();

        mRecentsView.onSwipeUpAnimationSuccess();

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);

            mTaskAnimationManager.setLiveTileCleanUpHandler(() -> {

                mRecentsView.cleanupRemoteTargets();

                mInputConsumerProxy.destroy();

            });

            mTaskAnimationManager.enableLiveTileRestartListener();

        }

quickstep/src/com/android/quickstep/views/RecentsView.java

+5 −1
Original line number Diff line number Diff line
@@ -4390,7 +4390,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
    public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,

            Runnable onFinishComplete) {

        // TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe?

        mRemoteTargetHandles = null;

        cleanupRemoteTargets();

        if (!toRecents && ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            // Reset the minimized state since we force-toggled the minimized state when entering

            // overview, but never actually finished the recents animation.  This is a catch all for
@@ -4849,6 +4849,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                && mCurrentGestureEndTarget != GestureState.GestureEndTarget.RECENTS;

    }



    public void cleanupRemoteTargets() {

        mRemoteTargetHandles = null;

    }



    /**

     * Used to register callbacks for when our empty message state changes.

     *