Merge "Support DeviceEntryIcon transition from dozingToDreaming" into main (32555ddc) · Commits · e / os / android_frameworks_base

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

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.systemui.keyguard.ui.viewmodel

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.compose.animation.scene.ObservableTransitionState
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING
		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.scene.data.repository.sceneContainerRepository
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class DozingToDreamingTransitionViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val underTest by lazy { kosmos.dozingToDreamingViewModel }

		@Before
		fun setUp() {
		kosmos.sceneContainerRepository.setTransitionState(
		MutableStateFlow<ObservableTransitionState>(
		ObservableTransitionState.Idle(Scenes.Lockscreen)
		)
		)
		}

		@Test
		fun deviceEntryParentViewDisappear() =
		testScope.runTest {
		val values by collectValues(underTest.deviceEntryParentViewAlpha)

		kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(
		listOf(
		step(0f, TransitionState.STARTED),
		step(0f),
		step(0.1f),
		step(0.2f),
		step(0.3f),
		step(1f),
		),
		testScope,
		)

		values.forEach { assertThat(it).isEqualTo(0f) }
		}

		private fun step(value: Float, transitionState: TransitionState = RUNNING) =
		TransitionStep(
		from = KeyguardState.DOZING,
		to = KeyguardState.DREAMING,
		value = value,
		transitionState = transitionState,
		ownerName = "dozingToDreamingTransitionViewModelTest",
		)
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToDreamingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel
		@@ -125,6 +126,12 @@ abstract class DeviceEntryIconTransitionModule {
		impl: AodToGlanceableHubTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun dozingToDreaming(
		impl: DozingToDreamingTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun dozingToGone(impl: DozingToGoneTransitionViewModel): DeviceEntryIconTransition

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ 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.DREAMING
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow

		@@ -31,7 +32,7 @@ import kotlinx.coroutines.flow.Flow
		@SysUISingleton
		class DozingToDreamingTransitionViewModel
		@Inject
		constructor(animationFlow: KeyguardTransitionAnimationFlow) {
		constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow.setup(
		duration = FromDozingTransitionInteractor.TO_DREAMING_DURATION,
		@@ -39,4 +40,7 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow) {
		)

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

		override val deviceEntryParentViewAlpha: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(0f)
		}

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

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

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

		import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture

		val Kosmos.dozingToDreamingViewModel by Fixture {
		DozingToDreamingTransitionViewModel(animationFlow = keyguardTransitionAnimationFlow)
		}