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

Commit 90abf51d 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: I42777fcd655a85f9914ced5101960eeefb4084fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0ee81b7 ed2e7719

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

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

                    if (mActivity != activity) {

                        return;

                        return;

                    }

                    }

                    if (mTaskAnimationManager != null) {

                        mTaskAnimationManager.finishRunningRecentsAnimation(true);

                    }

                    mRecentsView = null;

                    mRecentsView = null;

                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);

                    mActivity = null;

                    mActivity = null;

                }

                }

            };

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




    private void reset() {

    private void reset() {

        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);

        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);

        if (mActivity != null) {

            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);

        }

    }

    }





    /**

    /**