Merge "Update KeyguardInteractor#primaryBouncerShowing to include showingSoon" into main (96b10744) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,12 +19,10 @@ package com.android.systemui.keyguard.domain.interactor

		import android.app.StatusBarManager
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.compose.animation.scene.ObservableTransitionState
		import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR
		import com.android.systemui.Flags.FLAG_NEW_DOZING_KEYGUARD_STATES
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.bouncer.data.repository.keyguardBouncerRepository
		import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository
		@@ -682,7 +680,6 @@ class KeyguardInteractorTest : SysuiTestCase() {
		}

		@Test
		@EnableFlags(FLAG_NEW_DOZING_KEYGUARD_STATES)
		fun primaryBouncerShowing_bouncerShowingSoon() =
		testScope.runTest {
		val primaryBouncerShowing by collectLastValue(underTest.primaryBouncerShowing)

+11 −15

Original line number	Diff line number	Diff line
		@@ -278,7 +278,6 @@ constructor(
		/** Whether the primary bouncer is showing or about to show soon. */
		@JvmField
		val primaryBouncerShowing: StateFlow<Boolean> =
		if (com.android.systemui.Flags.newDozingKeyguardStates()) {
		combine(
		bouncerRepository.primaryBouncerShow,
		bouncerRepository.primaryBouncerShowingSoon,
		@@ -290,9 +289,6 @@ constructor(
		started = SharingStarted.WhileSubscribed(),
		initialValue = false,
		)
		} else {
		bouncerRepository.primaryBouncerShow
		}

		/** Whether the alternate bouncer is showing or not. */
		val alternateBouncerShowing: StateFlow<Boolean> = bouncerRepository.alternateBouncerVisible