Merge "Fix SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE value on activity launch" into main (616b3001) · Commits · e / os / android_frameworks_base

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -1206,6 +1206,16 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		"mPrimaryBouncerToGoneTransitionViewModel.getNotificationAlpha()");
		}, mMainDispatcher);
		}

		// Ensures that flags are updated when an activity launches
		collectFlow(mView,
		mShadeAnimationInteractor.isLaunchingActivity(),
		isLaunchingActivity -> {
		if (isLaunchingActivity) {
		updateSystemUiStateFlags();
		}
		},
		mMainDispatcher);
		}

		@VisibleForTesting
		@@ -3637,7 +3647,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,