Merge "Add dreaming => alternate bouncer support" into main (0717d281) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ constructor(
		) {

		override fun start() {
		listenForDreamingToAlternateBouncer()
		listenForDreamingToOccluded()
		listenForDreamingToGoneWhenDismissable()
		listenForDreamingToGoneFromBiometricUnlock()
		@@ -75,6 +76,16 @@ constructor(
		listenForDreamingToPrimaryBouncer()
		}

		private fun listenForDreamingToAlternateBouncer() {
		scope.launch("$TAG#listenForDreamingToAlternateBouncer") {
		keyguardInteractor.alternateBouncerShowing
		.filterRelevantKeyguardStateAnd { isAlternateBouncerShowing ->
		isAlternateBouncerShowing
		}
		.collect { startTransitionTo(KeyguardState.ALTERNATE_BOUNCER) }
		}
		}

		private fun listenForDreamingToGlanceableHub() {
		if (!communalHub()) return
		scope.launch("$TAG#listenForDreamingToGlanceableHub", mainDispatcher) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		@@ -160,4 +161,17 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() {
		to = KeyguardState.LOCKSCREEN,
		)
		}

		@Test
		fun testTransitionToAlternateBouncer() =
		testScope.runTest {
		kosmos.fakeKeyguardBouncerRepository.setAlternateVisible(true)
		runCurrent()

		assertThat(transitionRepository)
		.startedTransition(
		from = KeyguardState.DREAMING,
		to = KeyguardState.ALTERNATE_BOUNCER,
		)
		}
		}