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

Commit 632e9a84 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Don't applyState if taskbar is already destroyed" into tm-qpr-dev

parents cbedc7ed 9fb88830

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+4 −0
Original line number Diff line number Diff line
@@ -547,6 +547,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        }

    }



    public boolean isDestroyed() {

        return mIsDestroyed;

    }



    public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {

        mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags,

                fromInit);

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ import java.util.StringJoiner; 
    }



    public Animator applyState(long duration, boolean start) {

        if (mControllers.taskbarActivityContext.isDestroyed()) {

            return null;

        }

        Animator animator = null;

        if (mPrevState == null || mPrevState != mState) {

            // If this is our initial state, treat all flags as changed.