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