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

Commit ed2e7719 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

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

parents ccd3f9b4 50616568

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);

        }

    }



    /**