Merge "On lockscreenToPrimaryBouncer transition, don't use viewState" into main (a80a0d9b) · Commits · e / os / android_frameworks_base

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -338,11 +338,7 @@ constructor(
		lockscreenToGlanceableHubTransitionViewModel.keyguardAlpha,
		lockscreenToGoneTransitionViewModel.lockscreenAlpha(viewState),
		lockscreenToOccludedTransitionViewModel.lockscreenAlpha,
		if (Flags.newDozingKeyguardStates()) {
		lockscreenToPrimaryBouncerTransitionViewModel.lockscreenAlpha(viewState)
		} else {
		lockscreenToPrimaryBouncerTransitionViewModel.lockscreenAlpha
		},
		lockscreenToPrimaryBouncerTransitionViewModel.lockscreenAlpha,
		occludedToAlternateBouncerTransitionViewModel.lockscreenAlpha,
		occludedToAodTransitionViewModel.lockscreenAlpha,
		occludedToDozingTransitionViewModel.lockscreenAlpha,

+0 −11

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.keyguard.ui.viewmodel

		import android.util.MathUtils
		import com.android.systemui.Flags
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor
		@@ -69,18 +68,8 @@ constructor(private val blurConfig: BlurConfig, animationFlow: KeyguardTransitio
		onFinish = { 0f },
		)

		@Deprecated("use lockscreenAlpha(ViewStateAccessor) function instead")
		val lockscreenAlpha: Flow<Float> = shortcutsAlpha

		fun lockscreenAlpha(viewState: ViewStateAccessor): Flow<Float> {
		var startAlpha = 1f
		return transitionAnimation.sharedFlow(
		duration = FromLockscreenTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		onStart = { startAlpha = viewState.alpha() },
		onStep = { MathUtils.lerp(startAlpha, 0f, it) },
		)
		}

		val notificationAlpha: Flow<Float> =
		if (Flags.bouncerUiRevamp()) {
		transitionAnimation.sharedFlowWithShade(