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

Commit 9fb88830 authored by Tony Wickham's avatar Tony Wickham
Browse files

Don't applyState if taskbar is already destroyed 

Test: Open overview while unfolded, then fold; ensure hotseat remains
visible
Fixes: 260135164

Change-Id: I788a9a682a7d5fabbea7c478231fc7abe92e95b9
parent 68f56673

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

+4 −0
Original line number Diff line number Diff line
@@ -550,6 +550,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
@@ -247,6 +247,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.