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

Commit 549ea0b3 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Skip setting up ui if the handler is already invalidated" into sc-dev

parents c632e36d af7c86ad

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

+3 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    protected abstract void finishRecentsControllerToHome(Runnable callback);



    private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {

        if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {

            return;

        }

        endLauncherTransitionController();

        mRecentsView.onSwipeUpAnimationSuccess();

        if (LIVE_TILE.get()) {

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
        @Override

        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,

                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {

            if (mLastGestureState == null) {

                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(

                        mLiveTileRestartListener);

                return;

            }

            BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();

            if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()

                    && activityInterface.getCreatedActivity() != null) {