Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e68319fa authored by Chandru S's avatar Chandru S
Browse files

Revert using DeviceUnlockedInteractor for Compose bouncer. 

This reduces the number of variables (state) that can impact the compose bouncer launch.

Flag: com.android.systemui.compose_bouncer
Test: everything builds, compose bouncer works as expected
Bug: 310005730
Change-Id: Ie8f7dac0c3ec2d02c7edeba12104f8edca81970e
parent b04cd9be

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 },

            )

    }

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

+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 {

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

+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 },

        )

    }