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

Commit 16d90923 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Show "wrong password" on password screen, not "wrong PIN" 

Bug: 7452916
Change-Id: Ib31335837834dbf47bd55230a526151a502d9467
parent 6a64ac56

policy/src/com/android/internal/policy/impl/keyguard/KeyguardAbsKeyInputView.java

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
    }



    protected abstract int getPasswordTextViewId();

    protected abstract int getWrongPasswordStringId();

    protected abstract void resetState();



    @Override
@@ -144,7 +145,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
                long deadline = mLockPatternUtils.setLockoutAttemptDeadline();

                handleAttemptLockout(deadline);

            }

            mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pin, true);

            mSecurityMessageDisplay.setMessage(getWrongPasswordStringId(), true);

        }

        mPasswordEntry.setText("");

    }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java

+5 −0
Original line number Diff line number Diff line
@@ -108,4 +108,9 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView 
    @Override

    public void showUsabilityHint() {

    }



    @Override

    public int getWrongPasswordStringId() {

        return R.string.kg_wrong_pin;

    }

}

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java

+5 −0
Original line number Diff line number Diff line
@@ -193,4 +193,9 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
    @Override

    public void showUsabilityHint() {

    }



    @Override

    public int getWrongPasswordStringId() {

        return R.string.kg_wrong_password;

    }

}