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

Commit 017c01c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show alt auth bouncer before input bouncer" into sc-dev am: 211d6852 am: 6f8abf7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14549749

Change-Id: Id0e7f138a8e1f0264bc1f5d3dab6efeec27ddb4a
parents 770b0f59 6f8abf7e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3706,7 +3706,7 @@ public class StatusBar extends SystemUI implements DemoMode,
    private void showBouncerIfKeyguard() {
        if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)
                && !mKeyguardViewMediator.isHiding()) {
            mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */);
            mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
        }
    }

+21 −1
Original line number Diff line number Diff line
@@ -365,6 +365,26 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
        return false;
    }

    /**
     * If applicable, shows the alternate authentication bouncer. Else, shows the input
     * (pin/password/pattern) bouncer.
     * @param scrimmed true when the input bouncer should show scrimmed, false when the user will be
     * dragging it and translation should be deferred {@see KeyguardBouncer#show(boolean, boolean)}
     */
    public void showGenericBouncer(boolean scrimmed) {
        if (mAlternateAuthInterceptor != null) {
            if (mAlternateAuthInterceptor.showAlternateAuthBouncer()) {
                mStatusBar.updateScrimController();
            }
            return;
        }

        showBouncer(scrimmed);
    }

    /**
     * Hides the input bouncer (pin/password/pattern).
     */
    @VisibleForTesting
    void hideBouncer(boolean destroyView) {
        if (mBouncer == null) {
@@ -380,7 +400,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
    }

    /**
     * Shows the keyguard bouncer - the password challenge on the lock screen
     * Shows the keyguard input bouncer - the password challenge on the lock screen
     *
     * @param scrimmed true when the bouncer should show scrimmed, false when the user will be
     * dragging it and translation should be deferred {@see KeyguardBouncer#show(boolean, boolean)}