Merge "[flexiglass] Remove dead code in AlternateBouncerInteractor (1/2)." into main (ff063ad9) · Commits · e / os / android_frameworks_base

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

+5 −15

Original line number	Diff line number	Diff line
		@@ -29,10 +29,10 @@ import com.android.systemui.scene.domain.interactor.SceneInteractor
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.util.kotlin.BooleanFlowOperators.anyOf
		import com.android.systemui.util.time.SystemClock
		import dagger.Lazy
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
		@@ -46,13 +46,13 @@ import kotlinx.coroutines.flow.onEach
		import kotlinx.coroutines.flow.stateIn

		/** Encapsulates business logic for interacting with the lock-screen alternate bouncer. */
		@OptIn(ExperimentalCoroutinesApi::class)
		@SysUISingleton
		class AlternateBouncerInteractor
		@Inject
		constructor(
		private val bouncerRepository: KeyguardBouncerRepository,
		fingerprintPropertyRepository: FingerprintPropertyRepository,
		private val systemClock: SystemClock,
		private val deviceEntryBiometricsAllowedInteractor:
		Lazy<DeviceEntryBiometricsAllowedInteractor>,
		private val keyguardInteractor: Lazy<KeyguardInteractor>,
		@@ -60,9 +60,10 @@ constructor(
		sceneInteractor: Lazy<SceneInteractor>,
		@Application scope: CoroutineScope,
		) {
		var receivedDownTouch = false
		private var receivedDownTouch = false

		val isVisible: StateFlow<Boolean> = bouncerRepository.alternateBouncerVisible
		private val alternateBouncerUiAvailableFromSource: HashSet<String> = HashSet()

		val alternateBouncerSupported: StateFlow<Boolean> =
		fingerprintPropertyRepository.sensorType
		.map { sensorType -> sensorType.isUdfps() \|\| sensorType.isPowerButton() }
		@@ -157,15 +158,6 @@ constructor(
		return canShowAlternateBouncer.value
		}

		/**
		* Whether the alt bouncer has shown for a minimum time before allowing touches to dismiss the
		* alternate bouncer and show the primary bouncer.
		*/
		fun hasAlternateBouncerShownWithMinTime(): Boolean {
		return (systemClock.uptimeMillis() - bouncerRepository.lastAlternateBouncerVisibleTime) >
		MIN_VISIBILITY_DURATION_UNTIL_TOUCHES_DISMISS_ALTERNATE_BOUNCER_MS
		}

		/**
		* Should only be called through StatusBarKeyguardViewManager which propagates the source of
		* truth to other concerned controllers. Will hide the alternate bouncer if it's no longer
		@@ -181,8 +173,6 @@ constructor(
		}

		companion object {
		private const val MIN_VISIBILITY_DURATION_UNTIL_TOUCHES_DISMISS_ALTERNATE_BOUNCER_MS = 200L

		private const val TAG = "AlternateBouncerInteractor"
		}
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,14 +25,12 @@ import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInterac
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.scene.domain.interactor.sceneInteractor
		import com.android.systemui.util.time.systemClock

		val Kosmos.alternateBouncerInteractor: AlternateBouncerInteractor by
		Kosmos.Fixture {
		AlternateBouncerInteractor(
		bouncerRepository = keyguardBouncerRepository,
		fingerprintPropertyRepository = fingerprintPropertyRepository,
		systemClock = systemClock,
		deviceEntryBiometricsAllowedInteractor = { deviceEntryBiometricsAllowedInteractor },
		keyguardInteractor = { keyguardInteractor },
		keyguardTransitionInteractor = { keyguardTransitionInteractor },