Merge "Replace keyguardGoingAway usage with KTF to GONE transition" into main (cacbaefd) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+34 −6

Original line number	Diff line number	Diff line
		@@ -537,9 +537,31 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() {

		@Test
		@DisableSceneContainer
		fun authenticateDoesNotRunWhenKeyguardIsGoingAway() =
		fun authenticateDoesNotRunWhenKeyguardIsTransitioningToGone() =
		testScope.runTest {
		testGatingCheckForFaceAuth { keyguardRepository.setKeyguardGoingAway(true) }
		testGatingCheckForFaceAuth {
		keyguardTransitionRepository.sendTransitionStep(
		TransitionStep(
		transitionState = TransitionState.STARTED,
		from = KeyguardState.LOCKSCREEN,
		to = KeyguardState.GONE,
		)
		)
		}
		}

		@Test
		@DisableSceneContainer
		fun authenticateDoesNotRunWhenKeyguardIsGone() =
		testScope.runTest {
		testGatingCheckForFaceAuth {
		keyguardTransitionRepository.sendTransitionSteps(
		from = KeyguardState.LOCKSCREEN,
		to = KeyguardState.GONE,
		testScope = testScope,
		throughTransitionState = TransitionState.FINISHED,
		)
		}
		}

		@Test
		@@ -940,9 +962,17 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() {

		@Test
		@DisableSceneContainer
		fun detectDoesNotRunWhenKeyguardGoingAway() =
		fun detectDoesNotRunWhenTransitioningToGone() =
		testScope.runTest {
		testGatingCheckForDetect { keyguardRepository.setKeyguardGoingAway(true) }
		testGatingCheckForDetect {
		keyguardTransitionRepository.sendTransitionStep(
		TransitionStep(
		transitionState = TransitionState.STARTED,
		from = KeyguardState.LOCKSCREEN,
		to = KeyguardState.GONE,
		)
		)
		}
		}

		@Test
		@@ -1335,8 +1365,6 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() {
		kosmos.sceneInteractor.setTransitionState(
		MutableStateFlow(ObservableTransitionState.Idle(Scenes.Lockscreen))
		)
		} else {
		keyguardRepository.setKeyguardGoingAway(false)
		}
		powerInteractor.setAwakeForTest()
		biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true)

packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt

+9 −2

Original line number	Diff line number	Diff line
		@@ -397,9 +397,16 @@ constructor(
		.map { it.isTransitioning(to = Scenes.Gone) \|\| it.isIdle(Scenes.Gone) }
		.isFalse()
		} else {
		keyguardRepository.isKeyguardGoingAway.isFalse()
		(keyguardTransitionInteractor.isFinishedIn(KeyguardState.GONE)
		.or(
		keyguardTransitionInteractor.isInTransition(
		Edge.create(to = Scenes.Gone),
		Edge.create(to = KeyguardState.GONE)
		)
		)
		).isFalse()
		},
		"keyguardNotGoingAway",
		"keyguardNotGoneOrTransitioningToGone",
		),
		Pair(
		keyguardTransitionInteractor