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

Commit b4591df9 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Bouncer: Add title for each auth screen." into tm-dev am: ed72c410 

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

Change-Id: I49f2687794e424de102efeff2a3673e234820bff
parents 614799e6 ed72c410

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class KeyguardPasswordViewController 
    @Override

    void resetState() {

        mPasswordEntry.setTextOperationUser(UserHandle.of(KeyguardUpdateMonitor.getCurrentUser()));

        mMessageAreaController.setMessage("");

        mMessageAreaController.setMessage(R.string.keyguard_enter_your_password);

        final boolean wasDisabled = mPasswordEntry.isEnabled();

        mView.setPasswordEntryEnabled(true);

        mView.setPasswordEntryInputEnabled(true);

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

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ public class KeyguardPatternViewController 
    }



    private void displayDefaultSecurityMessage() {

        mMessageAreaController.setMessage("");

        mMessageAreaController.setMessage(R.string.keyguard_enter_your_pattern);

    }



    private void handleAttemptLockout(long elapsedRealtimeDeadline) {

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

+1 −0
Original line number Diff line number Diff line
@@ -132,5 +132,6 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 
    @Override

    void resetState() {

        mView.setPasswordEntryEnabled(true);

        mMessageAreaController.setMessage(R.string.keyguard_enter_your_pin);

    }

}

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

+0 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ public class KeyguardPinViewController 
        mView.reloadColors();

    }



    @Override

    void resetState() {

        super.resetState();

        mMessageAreaController.setMessage("");

    }



    @Override

    public boolean startDisappearAnimation(Runnable finishRunnable) {

        return mView.startDisappearAnimation(

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -88,6 +88,6 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() { 
    fun onPause_clearsTextField() {

        mKeyguardPatternViewController.init()

        mKeyguardPatternViewController.onPause()

        verify(mKeyguardMessageAreaController).setMessage("")

        verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_pattern)

    }

}