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

Commit ebbf5eea authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev 

* changes:
  Show "wrong password" on password screen, not "wrong PIN"
  Restore incorrect-PIN lockouts.
parents d2592635 16d90923

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

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

    }





    protected abstract int getPasswordTextViewId();

    protected abstract int getPasswordTextViewId();

    protected abstract int getWrongPasswordStringId();

    protected abstract void resetState();

    protected abstract void resetState();





    @Override

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

                long deadline = mLockPatternUtils.setLockoutAttemptDeadline();

                handleAttemptLockout(deadline);

                handleAttemptLockout(deadline);

            }

            }

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

            mSecurityMessageDisplay.setMessage(getWrongPasswordStringId(), true);

        }

        }

        mPasswordEntry.setText("");

        mPasswordEntry.setText("");

    }

    }
@@ -164,6 +165,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 




            @Override

            @Override

            public void onFinish() {

            public void onFinish() {

                mSecurityMessageDisplay.setMessage("", false);

                resetState();

                resetState();

            }

            }

        }.start();

        }.start();

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

+18 −5
Original line number Original line Diff line number Diff line
@@ -65,8 +65,10 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView 
                @Override

                @Override

                public void onClick(View v) {

                public void onClick(View v) {

                    doHapticKeyClick();

                    doHapticKeyClick();

                    if (mPasswordEntry.isEnabled()) {

                        verifyPasswordAndUnlock();

                        verifyPasswordAndUnlock();

                    }

                    }

                }

            });

            });

            ok.setOnHoverListener(new NumPadKey.LiftToActivateListener(getContext()));

            ok.setOnHoverListener(new NumPadKey.LiftToActivateListener(getContext()));

        }

        }
@@ -78,16 +80,22 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView 
            pinDelete.setVisibility(View.VISIBLE);

            pinDelete.setVisibility(View.VISIBLE);

            pinDelete.setOnClickListener(new OnClickListener() {

            pinDelete.setOnClickListener(new OnClickListener() {

                public void onClick(View v) {

                public void onClick(View v) {

                    // check for time-based lockouts

                    if (mPasswordEntry.isEnabled()) {

                        CharSequence str = mPasswordEntry.getText();

                        CharSequence str = mPasswordEntry.getText();

                        if (str.length() > 0) {

                        if (str.length() > 0) {

                            mPasswordEntry.setText(str.subSequence(0, str.length()-1));

                            mPasswordEntry.setText(str.subSequence(0, str.length()-1));

                        }

                        }

                    }

                    doHapticKeyClick();

                    doHapticKeyClick();

                }

                }

            });

            });

            pinDelete.setOnLongClickListener(new View.OnLongClickListener() {

            pinDelete.setOnLongClickListener(new View.OnLongClickListener() {

                public boolean onLongClick(View v) {

                public boolean onLongClick(View v) {

                    // check for time-based lockouts

                    if (mPasswordEntry.isEnabled()) {

                        mPasswordEntry.setText("");

                        mPasswordEntry.setText("");

                    }

                    doHapticKeyClick();

                    doHapticKeyClick();

                    return true;

                    return true;

                }

                }
@@ -104,4 +112,9 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView 
    @Override

    @Override

    public void showUsabilityHint() {

    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 Original line Diff line number Diff line
@@ -195,4 +195,9 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
    @Override

    @Override

    public void showUsabilityHint() {

    public void showUsabilityHint() {

    }

    }



    @Override

    public int getWrongPasswordStringId() {

        return R.string.kg_wrong_password;

    }

}
 
}

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,8 @@ public class NumPadKey extends Button { 
                    }

                    }

                }

                }

            }

            }

            if (mTextView != null) {

            // check for time-based lockouts

            if (mTextView != null && mTextView.isEnabled()) {

                mTextView.append(String.valueOf(mDigit));

                mTextView.append(String.valueOf(mDigit));

            }

            }

            doHapticKeyClick();

            doHapticKeyClick();