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

Commit 696f10f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix issue cauing the taskbar to show in the all set page of the SUW."... 

Merge "Fix issue cauing the taskbar to show in the all set page of the SUW." into tm-dev am: 6c7b0f7d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17140736

Change-Id: I093469dcbbaf3d9b2abfb7f240bdc94af939f475
parents b665810d 6c7b0f7d

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

+2 −1
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        mControllers.stashedHandleViewController.setIsHomeButtonDisabled(

                mControllers.navbarButtonsViewController.isHomeDisabled());

        mControllers.taskbarKeyguardController.updateStateForSysuiFlags(systemUiStateFlags);

        mControllers.taskbarStashController.updateStateForSysuiFlags(systemUiStateFlags, fromInit);

        mControllers.taskbarStashController.updateStateForSysuiFlags(

                systemUiStateFlags, fromInit || !isUserSetupComplete());

        mControllers.taskbarScrimViewController.updateStateForSysuiFlags(systemUiStateFlags,

                fromInit);

        mControllers.navButtonController.updateSysuiFlags(systemUiStateFlags);

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

+15 −12
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    public static final int FLAG_STASHED_IN_APP_IME = 1 << 5; // IME is visible

    public static final int FLAG_IN_STASHED_LAUNCHER_STATE = 1 << 6;

    public static final int FLAG_STASHED_IN_APP_ALL_APPS = 1 << 7; // All apps is visible.

    public static final int FLAG_IN_SETUP = 1 << 8; // In the Setup Wizard



    // If any of these flags are enabled, isInApp should return true.

    private static final int FLAGS_IN_APP = FLAG_IN_APP | FLAG_IN_SETUP;



    // If we're in an app and any of these flags are enabled, taskbar should be stashed.

    private static final int FLAGS_STASHED_IN_APP = FLAG_STASHED_IN_APP_MANUAL
@@ -141,7 +145,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    // Evaluate whether the handle should be stashed

    private final StatePropertyHolder mStatePropertyHolder = new StatePropertyHolder(

            flags -> {

                boolean inApp = hasAnyFlag(flags, FLAG_IN_APP);

                boolean inApp = hasAnyFlag(flags, FLAGS_IN_APP);

                boolean stashedInApp = hasAnyFlag(flags, FLAGS_STASHED_IN_APP);

                boolean stashedLauncherState = hasAnyFlag(flags, FLAG_IN_STASHED_LAUNCHER_STATE);

                return (inApp && stashedInApp) || (!inApp && stashedLauncherState);
@@ -179,10 +183,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        boolean isInSetup = !mActivity.isUserSetupComplete() || sharedState.setupUIVisible;

        updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);

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

        }

        updateStateForFlag(FLAG_IN_SETUP, isInSetup);

        applyState();



        notifyStashChange(/* visible */ false, /* stashed */ isStashedInApp());
@@ -216,9 +217,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
     * Sets the flag indicating setup UI is visible

     */

    protected void setSetupUIVisible(boolean isVisible) {

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP,

                isVisible || !mActivity.isUserSetupComplete());

        applyState();

        boolean hideTaskbar = isVisible || !mActivity.isUserSetupComplete();

        updateStateForFlag(FLAG_IN_SETUP, hideTaskbar);

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, hideTaskbar);

        applyState(hideTaskbar ? 0 : TASKBAR_STASH_DURATION);

    }



    /**
@@ -259,7 +261,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    }



    private boolean isInApp() {

        return hasAnyFlag(FLAG_IN_APP);

        return hasAnyFlag(FLAGS_IN_APP);

    }



    /**
@@ -478,7 +480,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    }



    public void applyState() {

        applyState(TASKBAR_STASH_DURATION);

        applyState(hasAnyFlag(FLAG_IN_SETUP) ? 0 : TASKBAR_STASH_DURATION);

    }



    public void applyState(long duration) {
@@ -568,8 +570,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        if (hasAnyFlag(changedFlags, FLAGS_STASHED_IN_APP)) {

            mControllers.uiController.onStashedInAppChanged();

        }

        if (hasAnyFlag(changedFlags, FLAGS_STASHED_IN_APP | FLAG_IN_APP)) {

            notifyStashChange(/* visible */ hasAnyFlag(FLAG_IN_APP),

        if (hasAnyFlag(changedFlags, FLAGS_STASHED_IN_APP | FLAGS_IN_APP)) {

            notifyStashChange(/* visible */ hasAnyFlag(FLAGS_IN_APP),

                            /* stashed */ isStashedInApp());

        }

        if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_MANUAL)) {
@@ -613,6 +615,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        str.add((flags & FLAG_IN_STASHED_LAUNCHER_STATE) != 0

                ? "FLAG_IN_STASHED_LAUNCHER_STATE" : "");

        str.add((flags & FLAG_STASHED_IN_APP_ALL_APPS) != 0 ? "FLAG_STASHED_IN_APP_ALL_APPS" : "");

        str.add((flags & FLAG_IN_SETUP) != 0 ? "FLAG_IN_SETUP" : "");

        return str.toString();

    }