Merge "Remove delay_bouncer flag" into main (7f9d72ca) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt

+4 −11

Original line number	Diff line number	Diff line
		@@ -38,8 +38,6 @@ import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.DismissCallbackRegistry
		import com.android.systemui.keyguard.data.repository.TrustRepository
		import com.android.systemui.plugins.ActivityStarter
		@@ -74,7 +72,6 @@ constructor(
		private val context: Context,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		private val trustRepository: TrustRepository,
		private val featureFlags: FeatureFlags,
		@Application private val applicationScope: CoroutineScope,
		) {
		private val passiveAuthBouncerDelay =
		@@ -135,14 +132,12 @@ constructor(

		init {
		keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)
		if (featureFlags.isEnabled(Flags.DELAY_BOUNCER)) {
		applicationScope.launch {
		trustRepository.isCurrentUserActiveUnlockRunning.collect {
		currentUserActiveUnlockRunning = it
		}
		}
		}
		}

		// TODO(b/243685699): Move isScrimmed logic to data layer.
		// TODO(b/243695312): Encapsulate all of the show logic for the bouncer.
		@@ -415,9 +410,7 @@ constructor(
		currentUserActiveUnlockRunning &&
		keyguardUpdateMonitor.canTriggerActiveUnlockBasedOnDeviceState()

		return featureFlags.isEnabled(Flags.DELAY_BOUNCER) &&
		!needsFullscreenBouncer() &&
		(canRunFaceAuth \|\| canRunActiveUnlock)
		return !needsFullscreenBouncer() && (canRunFaceAuth \|\| canRunActiveUnlock)
		}

		companion object {

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -250,10 +250,6 @@ object Flags {
		// TODO(b/277961132): Tracking bug.
		@JvmField val REVAMPED_BOUNCER_MESSAGES = unreleasedFlag("revamped_bouncer_messages")

		/** Whether to delay showing bouncer UI when face auth or active unlock are enrolled. */
		// TODO(b/279794160): Tracking bug.
		@JvmField val DELAY_BOUNCER = releasedFlag("delay_bouncer")

		/** Keyguard Migration */

		/**

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
		import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants
		import com.android.systemui.bouncer.ui.BouncerView
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.DismissCallbackRegistry
		import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository
		import com.android.systemui.keyguard.data.repository.FakeTrustRepository
		@@ -99,7 +97,6 @@ class UdfpsKeyguardViewLegacyControllerWithCoroutinesTest :
		context,
		mKeyguardUpdateMonitor,
		FakeTrustRepository(),
		FakeFeatureFlags().apply { set(Flags.DELAY_BOUNCER, true) },
		testScope.backgroundScope,
		)
		mAlternateBouncerInteractor =

packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorTest.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel
		import com.android.systemui.bouncer.ui.BouncerView
		import com.android.systemui.bouncer.ui.BouncerViewDelegate
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.DismissCallbackRegistry
		import com.android.systemui.keyguard.data.repository.FakeTrustRepository
		import com.android.systemui.plugins.ActivityStarter
		@@ -76,7 +74,6 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() {
		private lateinit var underTest: PrimaryBouncerInteractor
		private lateinit var resources: TestableResources
		private lateinit var trustRepository: FakeTrustRepository
		private lateinit var featureFlags: FakeFeatureFlags
		private lateinit var testScope: TestScope

		@Before
		@@ -89,7 +86,6 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() {
		testScope = TestScope()
		mainHandler = FakeHandler(android.os.Looper.getMainLooper())
		trustRepository = FakeTrustRepository()
		featureFlags = FakeFeatureFlags().apply { set(Flags.DELAY_BOUNCER, true) }
		underTest =
		PrimaryBouncerInteractor(
		repository,
		@@ -103,7 +99,6 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() {
		context,
		keyguardUpdateMonitor,
		trustRepository,
		featureFlags,
		testScope.backgroundScope,
		)
		whenever(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(null)

packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepositor
		import com.android.systemui.bouncer.ui.BouncerView
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.DismissCallbackRegistry
		import com.android.systemui.keyguard.data.repository.TrustRepository
		import com.android.systemui.statusbar.phone.KeyguardBypassController
		@@ -77,7 +75,6 @@ class PrimaryBouncerInteractorWithCoroutinesTest : SysuiTestCase() {
		context,
		keyguardUpdateMonitor,
		Mockito.mock(TrustRepository::class.java),
		FakeFeatureFlags().apply { set(Flags.DELAY_BOUNCER, true) },
		TestScope().backgroundScope,
		)
		}