Merge "Add device entry icon support for OCCLUDED => DOZING transition" into main (62076094) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenToGoneTransitionView
		import com.android.systemui.keyguard.ui.viewmodel.LockscreenToOccludedTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.LockscreenToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OccludedToAodTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OccludedToDozingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OccludedToGlanceableHubTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OccludedToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OffToLockscreenTransitionViewModel
		@@ -203,6 +204,12 @@ abstract class DeviceEntryIconTransitionModule {
		@IntoSet
		abstract fun occludedToAod(impl: OccludedToAodTransitionViewModel): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun occludedToDozing(
		impl: OccludedToDozingTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun occludedToLockscreen(

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ constructor(
		alternateBouncerToDozingTransitionViewModel: AlternateBouncerToDozingTransitionViewModel,
		dreamingToAodTransitionViewModel: DreamingToAodTransitionViewModel,
		primaryBouncerToLockscreenTransitionViewModel: PrimaryBouncerToLockscreenTransitionViewModel,
		occludedToDozingTransitionViewModel: OccludedToDozingTransitionViewModel,
		) {
		val color: Flow<Int> =
		deviceEntryIconViewModel.useBackgroundProtection.flatMapLatest { useBackground ->
		@@ -103,6 +104,7 @@ constructor(
		dreamingToAodTransitionViewModel.deviceEntryBackgroundViewAlpha,
		primaryBouncerToLockscreenTransitionViewModel
		.deviceEntryBackgroundViewAlpha,
		occludedToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha,
		)
		.merge()
		.onStart {

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

+19 −1

Original line number	Diff line number	Diff line
		@@ -17,15 +17,19 @@
		package com.android.systemui.keyguard.ui.viewmodel

		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor
		import com.android.systemui.keyguard.domain.interactor.FromOccludedTransitionInteractor
		import com.android.systemui.keyguard.shared.model.Edge
		import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING
		import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.emptyFlow
		import kotlinx.coroutines.flow.flatMapLatest

		/**
		* Breaks down OCCLUDED->DOZING transition into discrete steps for corresponding views to consume.
		@@ -35,8 +39,9 @@ import kotlinx.coroutines.flow.Flow
		class OccludedToDozingTransitionViewModel
		@Inject
		constructor(
		deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor,
		animationFlow: KeyguardTransitionAnimationFlow,
		) {
		) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow.setup(
		duration = FromOccludedTransitionInteractor.TO_DOZING_DURATION,
		@@ -50,4 +55,17 @@ constructor(
		duration = 250.milliseconds,
		onStep = { it },
		)

		val deviceEntryBackgroundViewAlpha: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(0f)

		override val deviceEntryParentViewAlpha: Flow<Float> =
		deviceEntryUdfpsInteractor.isUdfpsEnrolledAndEnabled.flatMapLatest { udfpsEnrolledAndEnabled
		->
		if (udfpsEnrolledAndEnabled) {
		transitionAnimation.immediatelyTransitionTo(1f)
		} else {
		emptyFlow()
		}
		}
		}

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToDozingTransitionViewModelKosmos.kt

+2 −0

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

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

		import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor
		import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		@@ -25,6 +26,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi

		val Kosmos.occludedToDozingTransitionViewModel by Fixture {
		OccludedToDozingTransitionViewModel(
		deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor,
		animationFlow = keyguardTransitionAnimationFlow,
		)
		}