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

Commit 8c3d0fb5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Close Taskbar AllApps when going from overview to home" into tm-qpr-dev... 

Merge "Close Taskbar AllApps when going from overview to home" into tm-qpr-dev am: 7c323889 am: 3cb0796d

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



Change-Id: Ie896ab713b9100da43f495536cf6f86ae5613849
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00ae9eb8 3cb0796d

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 =