Merge "Transition lockscreen alpha to 0f immediately when going from alt... (892cb6d8) · Commits · e / os / android_frameworks_base

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

+14 −13

Original line number	Diff line number	Diff line
		@@ -53,31 +53,32 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow, blurConfig: BlurConf
		edge = Edge.create(from = ALTERNATE_BOUNCER, to = PRIMARY_BOUNCER)
		)

		private val alphaForAnimationStep: (Float) -> Float =
		private val alphaFlow =
		transitionAnimation.sharedFlow(
		duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		onStep =
		when {
		SceneContainerFlag.isEnabled -> { step ->
		1f - Math.min((step / TO_BOUNCER_FADE_FRACTION), 1f)
		}
		else -> { step -> 1f - step }
		}

		private val alphaFlow =
		transitionAnimation.sharedFlow(
		duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		onStep = alphaForAnimationStep,
		else -> { step -> 1f - step }
		},
		)

		val lockscreenAlpha: Flow<Float> = if (Flags.bouncerUiRevamp()) alphaFlow else emptyFlow()
		val lockscreenAlpha: Flow<Float> =
		if (Flags.bouncerUiRevamp()) transitionAnimation.immediatelyTransitionTo(0f)
		else emptyFlow()

		val notificationAlpha: Flow<Float> =
		if (Flags.bouncerUiRevamp()) {
		transitionAnimation.sharedFlowWithShade(
		duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		onStep = { step, isShadeExpanded ->
		duration = 1.milliseconds,
		onStep = { _, isShadeExpanded ->
		if (isShadeExpanded) {
		1f
		} else if (Flags.bouncerUiRevamp()) {
		alphaForAnimationStep(step)
		0f
		} else {
		null
		}