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

Commit 94a2da3d authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Revert "Finish recents animation on activity destroyed."" into tm-dev am: ed2e7719 

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



Change-Id: Ic00ba33ae3b4e7b0c77c865a760d83ca29ca735d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ba11ea9 ed2e7719

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

+3 −4
Original line number Diff line number Diff line
@@ -166,11 +166,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                    if (mActivity != activity) {

                        return;

                    }

                    if (mTaskAnimationManager != null) {

                        mTaskAnimationManager.finishRunningRecentsAnimation(true);

                    }

                    mRecentsView = null;

                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);

                    mActivity = null;

                }

            };
@@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    private void reset() {

        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);

        if (mActivity != null) {

            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);

        }

    }



    /**