Merge "[Dual Shade] Fix a few unit tests for enabling Dual Shade by default." into main (d857f705) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntrySourceInteractorTest.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ 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.domain.interactor.enableSingleShade
		import com.android.systemui.shade.domain.interactor.shadeModeInteractor
		import com.android.systemui.shade.shared.model.ShadeMode
		import com.android.systemui.statusbar.phone.dozeScrimController
		import com.android.systemui.statusbar.phone.screenOffAnimationController
		import com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED
		@@ -302,8 +304,9 @@ class DeviceEntrySourceInteractorTest : SysuiTestCase() {
		@Test
		fun deviceEntryFromFaceUnlockOnShade_bypassAvailable_sceneContainerEnabled() =
		kosmos.runTest {
		val shadeMode by collectLastValue(shadeModeInteractor.shadeMode)
		enableSingleShade()
		runCurrent()
		assertThat(shadeMode).isEqualTo(ShadeMode.Single)
		configureKeyguardBypass(isBypassAvailable = true)
		val deviceEntryFromBiometricSource by
		collectLastValue(underTest.deviceEntryFromBiometricSource)

+2 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ class LockscreenContentViewModelTest(flags: FlagsParameterization) : SysuiTestCa
		@Test
		fun isContentVisible_whenOccluded_notVisible_evenIfShadeShown() =
		kosmos.runTest {
		enableSingleShade()
		keyguardOcclusionRepository.setShowWhenLockedActivityInfo(true, null)
		fakeKeyguardTransitionRepository.transitionTo(
		KeyguardState.LOCKSCREEN,
		@@ -212,6 +213,7 @@ class LockscreenContentViewModelTest(flags: FlagsParameterization) : SysuiTestCa
		@Test
		fun isContentVisible_whenOccluded_notVisibleInOccluded_visibleInAod() =
		kosmos.runTest {
		enableSingleShade()
		keyguardOcclusionRepository.setShowWhenLockedActivityInfo(true, null)
		fakeKeyguardTransitionRepository.transitionTo(
		from = KeyguardState.LOCKSCREEN,

+1 −0

Original line number	Diff line number	Diff line
		@@ -2198,6 +2198,7 @@ class SceneContainerStartableTest : SysuiTestCase() {
		prepareState()
		assertThat(currentScene).isEqualTo(Scenes.Lockscreen)
		underTest.start()
		runCurrent()

		fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true)
		fakeBiometricSettingsRepository.setIsUserInLockdown(true)