Merge "[bc25] Update KeyguardDismissActionInteractor to account for overlays." into main (6252d93a) · Commits · e / os / android_frameworks_base

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

+0 −2

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

+9 −11

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardDone
	import com.android.systemui.keyguard.shared.model.KeyguardState.GONE		import com.android.systemui.keyguard.shared.model.KeyguardState.GONE
	import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER		import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER
	import com.android.systemui.power.domain.interactor.PowerInteractor		import com.android.systemui.power.domain.interactor.PowerInteractor
	import com.android.systemui.scene.domain.interactor.SceneInteractor
	import com.android.systemui.scene.shared.flag.SceneContainerFlag		import com.android.systemui.scene.shared.flag.SceneContainerFlag
	import com.android.systemui.scene.shared.model.Scenes		import com.android.systemui.scene.shared.model.Scenes
	import com.android.systemui.shade.domain.interactor.ShadeInteractor		import com.android.systemui.shade.domain.interactor.ShadeInteractor
	@@ -60,7 +59,6 @@ constructor(
	transitionInteractor: KeyguardTransitionInteractor,		transitionInteractor: KeyguardTransitionInteractor,
	val dismissInteractor: KeyguardDismissInteractor,		val dismissInteractor: KeyguardDismissInteractor,
	@Application private val applicationScope: CoroutineScope,		@Application private val applicationScope: CoroutineScope,
	sceneInteractor: Lazy<SceneInteractor>,
	deviceUnlockedInteractor: Lazy<DeviceUnlockedInteractor>,		deviceUnlockedInteractor: Lazy<DeviceUnlockedInteractor>,
	powerInteractor: PowerInteractor,		powerInteractor: PowerInteractor,
	alternateBouncerInteractor: AlternateBouncerInteractor,		alternateBouncerInteractor: AlternateBouncerInteractor,
	@@ -102,11 +100,10 @@ constructor(
	private val isOnShadeWhileUnlocked: Flow<Boolean> =		private val isOnShadeWhileUnlocked: Flow<Boolean> =
	if (SceneContainerFlag.isEnabled) {		if (SceneContainerFlag.isEnabled) {
	combine(		combine(
	sceneInteractor.get().currentScene,		shadeInteractor.get().isAnyExpanded,
	deviceUnlockedInteractor.get().deviceUnlockStatus,		deviceUnlockedInteractor.get().deviceUnlockStatus,
	) { scene, unlockStatus ->		) { isAnyExpanded, unlockStatus ->
	unlockStatus.isUnlocked &&		isAnyExpanded && unlockStatus.isUnlocked
	(scene == Scenes.QuickSettings \|\| scene == Scenes.Shade)
	}		}
	.distinctUntilChanged()		.distinctUntilChanged()
	} else if (ComposeBouncerFlags.isOnlyComposeBouncerEnabled()) {		} else if (ComposeBouncerFlags.isOnlyComposeBouncerEnabled()) {
	@@ -116,6 +113,7 @@ constructor(
	) { isAnyExpanded, keyguardDismissible ->		) { isAnyExpanded, keyguardDismissible ->
	isAnyExpanded && keyguardDismissible		isAnyExpanded && keyguardDismissible
	}		}
			.distinctUntilChanged()
	} else {		} else {
	flow {		flow {
	error(		error(

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissActionInteractorKosmos.kt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,6 @@ import com.android.systemui.power.shared.model.WakefulnessState
	import com.android.systemui.scene.data.repository.Idle		import com.android.systemui.scene.data.repository.Idle
	import com.android.systemui.scene.data.repository.Transition		import com.android.systemui.scene.data.repository.Transition
	import com.android.systemui.scene.data.repository.setSceneTransition		import com.android.systemui.scene.data.repository.setSceneTransition
	import com.android.systemui.scene.domain.interactor.sceneInteractor
	import com.android.systemui.scene.shared.model.Scenes		import com.android.systemui.scene.shared.model.Scenes
	import com.android.systemui.shade.domain.interactor.shadeInteractor		import com.android.systemui.shade.domain.interactor.shadeInteractor
	import com.android.systemui.testKosmos		import com.android.systemui.testKosmos
	@@ -76,7 +75,6 @@ class KeyguardDismissActionInteractorTest : SysuiTestCase() {
	transitionInteractor = kosmos.keyguardTransitionInteractor,		transitionInteractor = kosmos.keyguardTransitionInteractor,
	dismissInteractor = dismissInteractor,		dismissInteractor = dismissInteractor,
	applicationScope = testScope.backgroundScope,		applicationScope = testScope.backgroundScope,
	sceneInteractor = { kosmos.sceneInteractor },
	deviceUnlockedInteractor = { kosmos.deviceUnlockedInteractor },		deviceUnlockedInteractor = { kosmos.deviceUnlockedInteractor },
	powerInteractor = kosmos.powerInteractor,		powerInteractor = kosmos.powerInteractor,
	alternateBouncerInteractor = kosmos.alternateBouncerInteractor,		alternateBouncerInteractor = kosmos.alternateBouncerInteractor,

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ import com.android.systemui.keyguard.data.repository.keyguardRepository
	import com.android.systemui.kosmos.Kosmos		import com.android.systemui.kosmos.Kosmos
	import com.android.systemui.kosmos.testScope		import com.android.systemui.kosmos.testScope
	import com.android.systemui.power.domain.interactor.powerInteractor		import com.android.systemui.power.domain.interactor.powerInteractor
	import com.android.systemui.scene.domain.interactor.sceneInteractor
	import com.android.systemui.shade.domain.interactor.shadeInteractor		import com.android.systemui.shade.domain.interactor.shadeInteractor
	import kotlinx.coroutines.ExperimentalCoroutinesApi		import kotlinx.coroutines.ExperimentalCoroutinesApi

	@@ -34,7 +33,6 @@ val Kosmos.keyguardDismissActionInteractor by
	transitionInteractor = keyguardTransitionInteractor,		transitionInteractor = keyguardTransitionInteractor,
	dismissInteractor = keyguardDismissInteractor,		dismissInteractor = keyguardDismissInteractor,
	applicationScope = testScope.backgroundScope,		applicationScope = testScope.backgroundScope,
	sceneInteractor = { sceneInteractor },
	deviceUnlockedInteractor = { deviceUnlockedInteractor },		deviceUnlockedInteractor = { deviceUnlockedInteractor },
	powerInteractor = powerInteractor,		powerInteractor = powerInteractor,
	alternateBouncerInteractor = alternateBouncerInteractor,		alternateBouncerInteractor = alternateBouncerInteractor,