Merge "Disable blur forcing shade window to be visible" into main (089efb6b) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -498,17 +498,18 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
	}		}

	private boolean isExpanded(NotificationShadeWindowState state) {		private boolean isExpanded(NotificationShadeWindowState state) {
			boolean visForBlur = !Flags.disableShadeVisibleWithBlur() && state.backgroundBlurRadius > 0;
	boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()		boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()
	\|\| state.panelVisible \|\| state.keyguardFadingAway \|\| state.bouncerShowing		\|\| state.panelVisible \|\| state.keyguardFadingAway \|\| state.bouncerShowing
	\|\| state.headsUpNotificationShowing		\|\| state.headsUpNotificationShowing
	\|\| state.scrimsVisibility != ScrimController.TRANSPARENT)		\|\| state.scrimsVisibility != ScrimController.TRANSPARENT)
	\|\| state.backgroundBlurRadius > 0		\|\| visForBlur
	\|\| state.launchingActivityFromNotification;		\|\| state.launchingActivityFromNotification;
	mLogger.logIsExpanded(isExpanded, state.forceWindowCollapsed,		mLogger.logIsExpanded(isExpanded, state.forceWindowCollapsed,
	state.isKeyguardShowingAndNotOccluded(), state.panelVisible,		state.isKeyguardShowingAndNotOccluded(), state.panelVisible,
	state.keyguardFadingAway, state.bouncerShowing, state.headsUpNotificationShowing,		state.keyguardFadingAway, state.bouncerShowing, state.headsUpNotificationShowing,
	state.scrimsVisibility != ScrimController.TRANSPARENT,		state.scrimsVisibility != ScrimController.TRANSPARENT,
	state.backgroundBlurRadius > 0, state.launchingActivityFromNotification);		visForBlur, state.launchingActivityFromNotification);
	return isExpanded;		return isExpanded;
	}		}