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

Commit 5af9f78e 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:... 

Merge "Fix taskbar linger above notification shade" into tm-qpr-dev am: 6488e7fe am: d6c98086 am: 86a93d46

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22160183



Change-Id: I43b2aebe4dceab54569f71dfecfb0d38fa86a91d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66b566c2 86a93d46

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ public class QuickStepContract { 
    // Whether the screen is currently transitioning into the state indicated by

    // SYSUI_STATE_SCREEN_ON.

    public static final int SYSUI_STATE_SCREEN_TRANSITION = 1 << 29;

    // The notification panel expansion fraction is > 0

    public static final int SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1 << 30;



    // Mask for SystemUiStateFlags to isolate SYSUI_STATE_SCREEN_ON and

    // SYSUI_STATE_SCREEN_TRANSITION, to match SCREEN_STATE_*

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_CLOS 
import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPEN;

import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPENING;

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

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

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

import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;
@@ -3457,7 +3458,9 @@ public final class NotificationPanelViewController implements Dumpable { 
            Log.d(TAG, "Updating panel sysui state flags: fullyExpanded="

                    + isFullyExpanded() + " inQs=" + mQsController.getExpanded());

        }

        mSysUiState.setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

        mSysUiState

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, getExpandedFraction() > 0)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

                        isFullyExpanded() && !mQsController.getExpanded())

                .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED,

                        isFullyExpanded() && mQsController.getExpanded()).commitUpdate(mDisplayId);

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -1485,16 +1485,16 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private void onPanelExpansionChanged(ShadeExpansionChangeEvent event) {

        float fraction = event.getFraction();

        boolean tracking = event.getTracking();

        boolean isExpanded = event.getExpanded();

        dispatchPanelExpansionForKeyguardDismiss(fraction, tracking);



        if (getNotificationPanelViewController() != null) {

            getNotificationPanelViewController().updateSystemUiStateFlags();

        }



        if (fraction == 0 || fraction == 1) {

            if (getNavigationBarView() != null) {

                getNavigationBarView().onStatusBarPanelStateChanged();

            }

            if (getNotificationPanelViewController() != null) {

                getNotificationPanelViewController().updateSystemUiStateFlags();

            }

        }

    }