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

Commit fcda3541 authored by Beverly's avatar Beverly
Browse files

Show alt auth bouncer before input bouncer 

When expanding a notification, show the alt auth bouncer before the
input (pin/password/pattern) bouncer.

Test: manual
Fixes: 188154723
Change-Id: I7343aee221b962cc1f6cf683b777662f07206c02
parent 65782cf2

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+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 */);

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

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