Merge "[Dual Shade] Fade out lock screen notifications when QS shade is open." into main (ddd8fa9a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -565,23 +565,17 @@ constructor(
		}
		Dual ->
		combineTransform(
		shadeModeInteractor.isShadeLayoutWide,
		headsUpNotificationInteractor.get().isHeadsUpOrAnimatingAway,
		shadeInteractor.shadeExpansion,
		shadeInteractor.qsExpansion,
		bouncerInteractor.bouncerExpansion,
		) {
		isShadeLayoutWide,
		isHeadsUpOrAnimatingAway,
		shadeExpansion,
		qsExpansion,
		bouncerExpansion ->
		if (bouncerExpansion > 0f) {
		emit(1 - bouncerExpansion)
		} else if (isShadeLayoutWide) {
		if (shadeExpansion > 0f) {
		emit(1f)
		}
		} else if (isHeadsUpOrAnimatingAway) {
		// Ensure HUNs will be visible in QS shade (at least while
		// unlocked)