diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index cf7c3e019818..d2af80093ee5 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -1200,6 +1200,16 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mNotificationStackScrollLayoutController.setMaxAlphaForExpansion(alpha); }, mMainDispatcher); } + + // Ensures that flags are updated when an activity launches + collectFlow(mView, + mShadeAnimationInteractor.isLaunchingActivity(), + isLaunchingActivity -> { + if (isLaunchingActivity) { + updateSystemUiStateFlags(); + } + }, + mMainDispatcher); } @VisibleForTesting @@ -3622,7 +3632,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump + isFullyExpanded() + " inQs=" + mQsController.getExpanded()); } mSysUiState - .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelExpanded()) + .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, + isPanelExpanded() && !isCollapsing()) .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, isFullyExpanded() && !mQsController.getExpanded()) .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED, |