Merge "Revert using DeviceUnlockedInteractor for Compose bouncer." into main (30c37da0) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ class KeyguardDismissActionInteractorTest : SysuiTestCase() {
		powerInteractor = kosmos.powerInteractor,
		alternateBouncerInteractor = kosmos.alternateBouncerInteractor,
		shadeInteractor = { kosmos.shadeInteractor },
		keyguardInteractor = { kosmos.keyguardInteractor },
		)
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ constructor(
		powerInteractor: PowerInteractor,
		alternateBouncerInteractor: AlternateBouncerInteractor,
		shadeInteractor: Lazy<ShadeInteractor>,
		keyguardInteractor: Lazy<KeyguardInteractor>,
		) {
		val dismissAction: Flow<DismissAction> = repository.dismissAction

		@@ -111,9 +112,9 @@ constructor(
		} else if (ComposeBouncerFlags.isOnlyComposeBouncerEnabled()) {
		combine(
		shadeInteractor.get().isAnyExpanded,
		deviceUnlockedInteractor.get().deviceUnlockStatus,
		) { isAnyExpanded, deviceUnlockStatus ->
		isAnyExpanded && deviceUnlockStatus.isUnlocked
		keyguardInteractor.get().isKeyguardDismissible,
		) { isAnyExpanded, keyguardDismissible ->
		isAnyExpanded && keyguardDismissible
		}
		} else {
		flow {

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,5 +39,6 @@ val Kosmos.keyguardDismissActionInteractor by
		powerInteractor = powerInteractor,
		alternateBouncerInteractor = alternateBouncerInteractor,
		shadeInteractor = { shadeInteractor },
		keyguardInteractor = { keyguardInteractor },
		)
		}