Merge "Simplify boolean expression." into main (d7517944) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/window/ui/viewmodel/WindowRootViewModel.kt

+4 −9

Original line number	Diff line number	Diff line
		@@ -103,15 +103,10 @@ constructor(
		combine(blurInteractor.isBlurCurrentlySupported, shadeInteractor.isAnyFullyExpanded) {
		blurSupported,
		anyShadeFullyExpanded ->
		return@combine if (blurSupported) {
		when {
		if (blurSupported) {
		// scrims will be opaque when shade is fully expanded
		// Fall back to old behavior when shade blur is not enabled.
		anyShadeFullyExpanded && !Flags.notificationShadeBlur() -> true
		// surface is never opaque in other scenarios so that the wallpaper/surface
		// behind is always visible.
		else -> false
		}
		!Flags.notificationShadeBlur() && anyShadeFullyExpanded
		} else {
		anyShadeFullyExpanded
		}