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

Commit cea34451 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix taskbar linger above notification shade" into tm-qpr-dev am: 96892011 

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



Change-Id: Iec6bfc729ea0c5b9c40cc3f491dd850427039349
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67f8285b 96892011

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

+3 −5
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLA 
import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_FULLSCREEN;

import static com.android.launcher3.taskbar.TaskbarManager.FLAG_HIDE_NAVBAR_WINDOW;

import static com.android.launcher3.testing.shared.ResourceUtils.getBoolByName;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING;



import android.animation.AnimatorSet;
@@ -571,9 +570,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {

        mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags,

                fromInit);

        int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED

                | SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

        onNotificationShadeExpandChanged((systemUiStateFlags & shadeExpandedFlags) != 0, fromInit);

        boolean isShadeVisible = (systemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0;

        onNotificationShadeExpandChanged(isShadeVisible, fromInit);

        mControllers.taskbarViewController.setRecentsButtonDisabled(

                mControllers.navbarButtonsViewController.isRecentsDisabled()

                        || isNavBarKidsModeActive());

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

+2 −4
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ import static com.android.launcher3.util.FlagDebugUtils.appendFlag; 
import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;



import android.animation.Animator;
@@ -907,8 +906,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        long startDelay = 0;



        updateStateForFlag(FLAG_STASHED_IN_APP_SYSUI, hasAnyFlag(systemUiStateFlags,

                SYSUI_STATE_QUICK_SETTINGS_EXPANDED

                        | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED));

                SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE));

        updateStateForFlag(FLAG_STASHED_SYSUI,

                hasAnyFlag(systemUiStateFlags, SYSUI_STATE_SCREEN_PINNING));

        updateStateForFlag(FLAG_STASHED_DEVICE_LOCKED,