Merge "Revert "Lockscreen is invisible"" into main (6803757a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodAlphaViewModel.kt

+6 −3

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.merge
		import kotlinx.coroutines.flow.onStart

		/** Models UI state for the alpha of the AOD (always-on display). */
		@SysUISingleton
		@@ -42,13 +43,15 @@ constructor(
		/** The alpha level for the entire lockscreen while in AOD. */
		val alpha: Flow<Float> =
		combine(
		keyguardTransitionInteractor.currentKeyguardState,
		keyguardTransitionInteractor.transitionValue(KeyguardState.GONE).onStart {
		emit(0f)
		},
		merge(
		keyguardInteractor.keyguardAlpha,
		occludedToLockscreenTransitionViewModel.lockscreenAlpha,
		)
		) { currentKeyguardState, alpha ->
		if (currentKeyguardState == KeyguardState.GONE) {
		) { transitionToGone, alpha ->
		if (transitionToGone == 1f) {
		// Ensures content is not visible when in GONE state
		0f
		} else {