Merge "Handle bouncer <-> dreaming transition" into main (1c3d58e1) · Commits · e / os / android_frameworks_base

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

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		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.keyguard.ui.transitions.blurConfig
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import kotlinx.coroutines.test.runTest
		import org.junit.Test
		import org.junit.runner.RunWith

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

		@Test
		fun dreamingToPrimaryBouncerChangesBlurToMax() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)

		kosmos.keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(
		transitionProgress = listOf(0.0f, 0.0f, 0.3f, 0.4f, 0.5f, 1.0f),
		startValue = kosmos.blurConfig.maxBlurRadiusPx,
		endValue = kosmos.blurConfig.maxBlurRadiusPx,
		transitionFactory = ::step,
		actualValuesProvider = { values },
		checkInterpolatedValues = false,
		)
		}

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

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

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		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.keyguard.ui.transitions.blurConfig
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class PrimaryBouncerToDreamingTransitionViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository
		private lateinit var underTest: PrimaryBouncerToDreamingTransitionViewModel

		@Before
		fun setUp() {
		keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		underTest = kosmos.primaryBouncerToDreamingTransitionViewModel
		}

		@Test
		fun blurRadiusGoesToMinImmediately() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)

		kosmos.keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(
		transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.65f, 0.7f, 1.0f),
		startValue = kosmos.blurConfig.maxBlurRadiusPx,
		endValue = kosmos.blurConfig.minBlurRadiusPx,
		actualValuesProvider = { values },
		transitionFactory = ::step,
		)
		}

		private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.PRIMARY_BOUNCER,
		to = KeyguardState.DREAMING,
		value = value,
		transitionState = state,
		ownerName = "PrimaryBouncerToDreamingTransitionViewModelTest",
		)
		}
		}

packages/SystemUI/src/com/android/systemui/keyguard/dagger/PrimaryBouncerTransitionModule.kt

+10 −0

Original line number	Diff line number	Diff line
		@@ -20,11 +20,13 @@ import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DreamingToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.LockscreenToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.OccludedToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToAodTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDreamingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGlanceableHubTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel
		@@ -79,6 +81,10 @@ interface PrimaryBouncerTransitionImplModule {
		@IntoSet
		fun fromOccluded(impl: OccludedToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun fromDreaming(impl: DreamingToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun toAod(impl: PrimaryBouncerToAodTransitionViewModel): PrimaryBouncerTransition
		@@ -101,6 +107,10 @@ interface PrimaryBouncerTransitionImplModule {
		@IntoSet
		fun toGone(impl: PrimaryBouncerToGoneTransitionViewModel): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun toDreaming(impl: PrimaryBouncerToDreamingTransitionViewModel): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun toOccluded(impl: PrimaryBouncerToOccludedTransitionViewModel): PrimaryBouncerTransition

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -316,5 +316,6 @@ constructor(
		val TO_LOCKSCREEN_DURATION = 1167.milliseconds
		val TO_AOD_DURATION = 300.milliseconds
		val TO_GONE_DURATION = DEFAULT_DURATION
		val TO_PRIMARY_BOUNCER_DURATION = DEFAULT_DURATION
		}
		}

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -294,5 +294,6 @@ constructor(
		val TO_OCCLUDED_DURATION = 550.milliseconds
		val TO_GLANCEABLE_HUB_DURATION = DEFAULT_DURATION
		val TO_GONE_SURFACE_BEHIND_VISIBLE_THRESHOLD = 0.1f
		val TO_DREAMING_DURATION = DEFAULT_DURATION
		}
		}