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

Commit 835ccc58 authored by Alex Chau's avatar Alex Chau
Browse files

Close Taskbar AllApps when going from overview to home 

- Also trigger closeAllOpenViews when changing state to NORMAL

Fix: 265689318
Test: manual
Change-Id: I109c0f3a3c741844c8747bd76a6c38bf301ec737
parent 60c7dfec

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

+11 −5
Original line number Diff line number Diff line
@@ -258,8 +258,9 @@ import java.util.StringJoiner; 
    }



    private Animator onStateChangeApplied(int changedFlags, long duration, boolean start) {

        boolean goingToLauncher = isInLauncher();

        final boolean goingToLauncher = isInLauncher();

        final float toAlignment = isIconAlignedWithHotseat() ? 1 : 0;

        boolean handleOpenFloatingViews = false;

        if (DEBUG) {

            Log.d(TAG, "onStateChangeApplied - mState: " + getStateString(mState)

                    + ", changedFlags: " + getStateString(changedFlags)
@@ -280,6 +281,10 @@ import java.util.StringJoiner; 
                updateStateForFlag(FLAG_RESUMED, false);

                applyState(0 /* duration */);

            }

            if (mLauncherState == LauncherState.NORMAL) {

                // We're changing state to home, should close open popups e.g. Taskbar AllApps

                handleOpenFloatingViews = true;

            }

        }



        if (hasAnyFlag(changedFlags, FLAGS_LAUNCHER)) {
@@ -303,10 +308,11 @@ import java.util.StringJoiner; 
                }

            });



            if (goingToLauncher) {

            // Handle closing open popups when going home/overview

                AbstractFloatingView.closeAllOpenViews(mControllers.taskbarActivityContext);

            handleOpenFloatingViews = true;

        }

        if (handleOpenFloatingViews && goingToLauncher) {

            AbstractFloatingView.closeAllOpenViews(mControllers.taskbarActivityContext);

        }



        float backgroundAlpha =