Merge "[flexiglass] Set scene transition in tests" into main (084f4f2e) · Commits · e / os / android_frameworks_base

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

+27 −2

Original line number	Diff line number	Diff line
		@@ -33,10 +33,17 @@ 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.scene.data.repository.ShowOverlay
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.shade.shadeTestUtil
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@@ -53,6 +60,18 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()

		private val shadeTestUtil by lazy { kosmos.shadeTestUtil }

		@Before
		fun setUp() {
		// Put STL in transition: Lockscreen (includes KeyguardState.ALTERNATE_BOUNCER) => Bouncer
		kosmos.setSceneTransition(
		ShowOverlay(
		overlay = Overlays.Bouncer,
		fromScene = Scenes.Lockscreen,
		progress = flowOf(.5f),
		)
		)
		}

		@Test
		fun deviceEntryParentViewDisappear() =
		testScope.runTest {
		@@ -75,7 +94,6 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()

		@Test
		@EnableFlags(FLAG_BOUNCER_UI_REVAMP)
		@BrokenWithSceneContainer(388068805)
		fun notifications_areFullyVisible_whenShadeIsOpen() =
		testScope.runTest {
		val values by collectValues(underTest.notificationAlpha)
		@@ -97,6 +115,7 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()

		@Test
		@EnableFlags(FLAG_NOTIFICATION_SHADE_BLUR)
		@BrokenWithSceneContainer(388068805)
		fun blurRadiusGoesToMaximumWhenShadeIsExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		@@ -132,6 +151,7 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()
		}

		@Test
		@BrokenWithSceneContainer(388068805)
		fun blurRadiusGoesFromMinToMaxWhenShadeIsNotExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		@@ -149,7 +169,12 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()
		private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.ALTERNATE_BOUNCER,
		to = KeyguardState.PRIMARY_BOUNCER,
		to =
		if (SceneContainerFlag.isEnabled) {
		KeyguardState.UNDEFINED
		} else {
		KeyguardState.PRIMARY_BOUNCER
		},
		value = value,
		transitionState = state,
		ownerName = "AlternateBouncerToPrimaryBouncerTransitionViewModelTest",

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

+25 −1

Original line number	Diff line number	Diff line
		@@ -30,10 +30,17 @@ import com.android.systemui.keyguard.shared.model.TransitionState.STARTED
		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.scene.data.repository.ShowOverlay
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@@ -44,6 +51,18 @@ class AodToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		private val testScope = kosmos.testScope
		private val underTest by lazy { kosmos.aodToPrimaryBouncerTransitionViewModel }

		@Before
		fun setUp() {
		// Put STL in transition: Lockscreen (includes KeyguardState.AOD) => Bouncer
		kosmos.setSceneTransition(
		ShowOverlay(
		overlay = Overlays.Bouncer,
		fromScene = Scenes.Lockscreen,
		progress = flowOf(.5f),
		)
		)
		}

		@Test
		fun aodToPrimaryBouncerChangesBlurToMax() =
		testScope.runTest {
		@@ -77,7 +96,12 @@ class AodToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		private fun step(value: Float, transitionState: TransitionState = RUNNING) =
		TransitionStep(
		from = KeyguardState.AOD,
		to = KeyguardState.PRIMARY_BOUNCER,
		to =
		if (SceneContainerFlag.isEnabled) {
		KeyguardState.UNDEFINED
		} else {
		KeyguardState.PRIMARY_BOUNCER
		},
		value = value,
		transitionState = transitionState,
		ownerName = "AodToPrimaryBouncerTransitionViewModelTest",

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

+21 −1

Original line number	Diff line number	Diff line
		@@ -32,8 +32,14 @@ import com.android.systemui.keyguard.shared.model.TransitionState.STARTED
		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.scene.data.repository.ShowOverlay
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		@@ -52,6 +58,15 @@ class DozingToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		fun setUp() {
		keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		underTest = kosmos.dozingToPrimaryBouncerTransitionViewModel

		// Put STL in transition: Lockscreen (includes KeyguardState.DOZING) => Bouncer
		kosmos.setSceneTransition(
		ShowOverlay(
		overlay = Overlays.Bouncer,
		fromScene = Scenes.Lockscreen,
		progress = flowOf(.5f),
		)
		)
		}

		@Test
		@@ -106,7 +121,12 @@ class DozingToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.DOZING,
		to = KeyguardState.PRIMARY_BOUNCER,
		to =
		if (SceneContainerFlag.isEnabled) {
		KeyguardState.UNDEFINED
		} else {
		KeyguardState.PRIMARY_BOUNCER
		},
		value = value,
		transitionState = state,
		ownerName = "DozingToPrimaryBouncerTransitionViewModelTest",

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

+22 −1

Original line number	Diff line number	Diff line
		@@ -29,8 +29,14 @@ import com.android.systemui.keyguard.shared.model.TransitionState
		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.scene.data.repository.HideOverlay
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		@@ -53,6 +59,16 @@ class PrimaryBouncerToAodTransitionViewModelTest : SysuiTestCase() {
		@Before
		fun setup() {
		underTest = kosmos.primaryBouncerToAodTransitionViewModel

		// Put STL in transition: Bouncer => Lockscreen transition (includes KeyguardState.AOD)
		kosmos.setSceneTransition(
		HideOverlay(
		overlay = Overlays.Bouncer,
		toScene = Scenes.Lockscreen,
		currentOverlays = flowOf(setOf(Overlays.Bouncer)),
		progress = flowOf(.5f),
		)
		)
		}

		@Test
		@@ -163,7 +179,12 @@ class PrimaryBouncerToAodTransitionViewModelTest : SysuiTestCase() {
		state: TransitionState = TransitionState.RUNNING,
		): TransitionStep {
		return TransitionStep(
		from = KeyguardState.PRIMARY_BOUNCER,
		from =
		if (SceneContainerFlag.isEnabled) {
		KeyguardState.UNDEFINED
		} else {
		KeyguardState.PRIMARY_BOUNCER
		},
		to = KeyguardState.AOD,
		value = value,
		transitionState = state,

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

+22 −1

Original line number	Diff line number	Diff line
		@@ -32,8 +32,14 @@ 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.scene.data.repository.HideOverlay
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		@@ -55,6 +61,16 @@ class PrimaryBouncerToDozingTransitionViewModelTest : SysuiTestCase() {
		fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository
		biometricSettingsRepository = kosmos.biometricSettingsRepository
		underTest = kosmos.primaryBouncerToDozingTransitionViewModel

		// Put STL in transition: Bouncer => Lockscreen transition (includes KeyguardState.DOZING)
		kosmos.setSceneTransition(
		HideOverlay(
		overlay = Overlays.Bouncer,
		toScene = Scenes.Lockscreen,
		currentOverlays = flowOf(setOf(Overlays.Bouncer)),
		progress = flowOf(.5f),
		)
		)
		}

		@Test
		@@ -137,7 +153,12 @@ class PrimaryBouncerToDozingTransitionViewModelTest : SysuiTestCase() {

		private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.PRIMARY_BOUNCER,
		from =
		if (SceneContainerFlag.isEnabled) {
		KeyguardState.UNDEFINED
		} else {
		KeyguardState.PRIMARY_BOUNCER
		},
		to = KeyguardState.DOZING,
		value = value,
		transitionState = state,