Merge "[Dual Shade] Fix Notification Blur getting stuck" into main (38c64ff0) · Commits · e / os / android_frameworks_base

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.combineTransform
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flowOf
		@@ -227,16 +226,7 @@ constructor(
		if (SceneContainerFlag.isEnabled) {
		shadeModeInteractor.shadeMode.flatMapLatest { shadeMode ->
		when (shadeMode) {
		ShadeMode.Dual ->
		combineTransform(
		shadeInteractor.shadeExpansion,
		shadeInteractor.qsExpansion,
		) { notificationShadeExpansion, qsExpansion ->
		if (notificationShadeExpansion == 0f) {
		// Blur out notifications as the QS overlay panel expands
		emit(qsExpansion)
		}
		}
		ShadeMode.Dual -> shadeInteractor.qsExpansion
		else -> flowOf(0f)
		}
		}