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

Commit b0bd2321 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show alt bouncer if needed when dismissing keyguard w/ callback." into main

parents 198b9f7d f52c997c
Loading
Loading
Loading
Loading
+12 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package com.android.systemui.keyguard.domain.interactor

import com.android.app.tracing.coroutines.launchTraced as launch
import com.android.internal.policy.IKeyguardDismissCallback
import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor
import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
@@ -39,7 +40,6 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.merge
import com.android.app.tracing.coroutines.launchTraced as launch
import kotlinx.coroutines.withContext

/** Encapsulates business logic for requesting the keyguard to dismiss/finish/done. */
@@ -53,8 +53,8 @@ constructor(
    private val primaryBouncerInteractor: PrimaryBouncerInteractor,
    private val selectedUserInteractor: SelectedUserInteractor,
    private val dismissCallbackRegistry: DismissCallbackRegistry,
    private val alternateBouncerInteractor: AlternateBouncerInteractor,
    trustRepository: TrustRepository,
    alternateBouncerInteractor: AlternateBouncerInteractor,
    powerInteractor: PowerInteractor,
) {
    /*
@@ -151,14 +151,17 @@ constructor(
                    dismissCallbackRegistry.addCallback(callback)
                }

                // This will either show the bouncer, or dismiss the keyguard if insecure.
                // We currently need to request showing the primary bouncer in order to start a
                // transition to PRIMARY_BOUNCER. Once we refactor that so that starting the
                // transition is what causes the bouncer to show, we can remove this entire method,
                // and simply ask KeyguardTransitionInteractor to transition to a bouncer state or
                // dismiss keyguard.
                // This will either show the bouncer, or dismiss the keyguard if insecure. We
                // currently need to request showing the bouncer in order to start a transition to
                // *_BOUNCER. Once we refactor that so that starting the transition is what causes
                // the bouncer to show, we can remove this entire method, and simply call
                // KeyguardDismissTransitionInteractor#startDismissKeyguardTransition.
                if (alternateBouncerInteractor.canShowAlternateBouncer.value) {
                    alternateBouncerInteractor.forceShow()
                } else {
                    primaryBouncerInteractor.show(true)
                }
            }
        }
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ val Kosmos.keyguardDismissInteractor by
            primaryBouncerInteractor = primaryBouncerInteractor,
            selectedUserInteractor = selectedUserInteractor,
            dismissCallbackRegistry = dismissCallbackRegistry,
            trustRepository = trustRepository,
            alternateBouncerInteractor = alternateBouncerInteractor,
            trustRepository = trustRepository,
            powerInteractor = powerInteractor,
        )
    }