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

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

Merge "Show the user switcher only when the bouncer cancel button is pressed."

parents 49b58654 0a427ef5

packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java

+5 −0
Original line number Diff line number Diff line
@@ -242,6 +242,11 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback { 
        mViewMediatorCallback.resetKeyguard();

    }



    @Override

    public void onCancelClicked() {

        mViewMediatorCallback.onCancelClicked();

    }



    public void resetSecurityContainer() {

        mSecurityContainer.reset();

    }

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

                mCallback.onCancelClicked();

            });

        }

    }

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

                mCallback.onCancelClicked();

            });

        }

packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

                mCallback.onCancelClicked();

            });

        }

    }

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java

+7 −0
Original line number Diff line number Diff line
@@ -48,4 +48,11 @@ public interface KeyguardSecurityCallback { 
     * Resets the keyguard view.

     */

    void reset();



    /**

     * Call when cancel button is pressed in bouncer.

     */

    default void onCancelClicked() {

        // No-op

    }

}