Merge "[flexiglass] Set NSSLC#mMaxAlphaForKeyguard to 1 after LS -> Gone" into main (24e011b4) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow.FlowBuilder
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		import javax.inject.Inject
		@@ -50,9 +51,7 @@ constructor(
		duration = FromLockscreenTransitionInteractor.TO_GONE_DURATION,
		edge = Edge.create(from = LOCKSCREEN, to = Scenes.Gone),
		)
		.setupWithoutSceneContainer(
		edge = Edge.create(from = LOCKSCREEN, to = GONE),
		)
		.setupWithoutSceneContainer(edge = Edge.create(from = LOCKSCREEN, to = GONE))

		val shortcutsAlpha: Flow<Float> =
		transitionAnimation.sharedFlow(
		@@ -65,6 +64,10 @@ constructor(
		fun notificationAlpha(viewState: ViewStateAccessor): Flow<Float> {
		var startAlpha = 1f
		var leaveShadeOpen = false
		val endAction: (() -> Float)? =
		if (SceneContainerFlag.isEnabled) {
		{ 1f }
		} else null

		return transitionAnimation.sharedFlow(
		duration = 80.milliseconds,
		@@ -79,6 +82,8 @@ constructor(
		MathUtils.lerp(startAlpha, 0f, it)
		}
		},
		onFinish = endAction,
		onCancel = endAction,
		)
		}