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

Commit 9b3b2b9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure some taskbar states are initialized correctly" into sc-v2-dev

parents 36e5f812 7f5e4ca0

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

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ import java.util.function.Supplier; 
        onIconAlignmentRatioChangedForAppAndHomeTransition();



        mLauncher.getStateManager().addStateListener(mStateListener);



        // Initialize to the current launcher state

        updateStateForFlag(FLAG_RESUMED, launcher.hasBeenResumed());

        mLauncherState = launcher.getStateManager().getState();

        applyState(0);

    }



    public void onDestroy() {

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

+6 −2
Original line number Diff line number Diff line
@@ -171,9 +171,13 @@ public class TaskbarStashController { 


        boolean isManuallyStashedInApp = supportsManualStashing()

                && mPrefs.getBoolean(SHARED_PREFS_STASHED_KEY, DEFAULT_STASHED_PREF);

        boolean isInSetup = !mActivity.isUserSetupComplete() || sharedState.setupUIVisible;

        updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP,

                !mActivity.isUserSetupComplete() || sharedState.setupUIVisible);

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, isInSetup);

        if (isInSetup) {

            // Update the in-app state to ensure isStashed() reflects right state during SUW

            updateStateForFlag(FLAG_IN_APP, true);

        }

        applyState();



        notifyStashChange(/* visible */ false, /* stashed */ isStashedInApp());