Implemented new PIN unlock design
The pin unlock design was changed according to the spec
and new animations where introduced for the password field.
Bug: 13735707
Change-Id: I76f5e873bd0ea4f34ca3d2cd971223f0a83e2f28
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
index 1f3c176..ec5d040eb 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
@@ -28,8 +28,7 @@
/**
* Displays a PIN pad for unlocking.
*/
-public class KeyguardPINView extends KeyguardAbsKeyInputView
- implements KeyguardSecurityView, OnEditorActionListener, TextWatcher {
+public class KeyguardPINView extends KeyguardPinBasedInputView {
private final AppearAnimationUtils mAppearAnimationUtils;
private ViewGroup mKeyguardBouncerFrame;
@@ -49,12 +48,12 @@
}
protected void resetState() {
+ super.resetState();
if (KeyguardUpdateMonitor.getInstance(mContext).getMaxBiometricUnlockAttemptsReached()) {
mSecurityMessageDisplay.setMessage(R.string.faceunlock_multiple_failures, true);
} else {
mSecurityMessageDisplay.setMessage(R.string.kg_pin_instructions, false);
}
- mPasswordEntry.setEnabled(true);
}
@Override
@@ -72,54 +71,6 @@
mRow2 = (ViewGroup) findViewById(R.id.row2);
mRow3 = (ViewGroup) findViewById(R.id.row3);
mDivider = findViewById(R.id.divider);
- final View ok = findViewById(R.id.key_enter);
- if (ok != null) {
- ok.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- doHapticKeyClick();
- if (mPasswordEntry.isEnabled()) {
- verifyPasswordAndUnlock();
- }
- }
- });
- ok.setOnHoverListener(new LiftToActivateListener(getContext()));
- }
-
- // The delete button is of the PIN keyboard itself in some (e.g. tablet) layouts,
- // not a separate view
- View pinDelete = findViewById(R.id.delete_button);
- if (pinDelete != null) {
- pinDelete.setVisibility(View.VISIBLE);
- pinDelete.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- // check for time-based lockouts
- if (mPasswordEntry.isEnabled()) {
- CharSequence str = mPasswordEntry.getText();
- if (str.length() > 0) {
- mPasswordEntry.setText(str.subSequence(0, str.length()-1));
- }
- }
- doHapticKeyClick();
- }
- });
- pinDelete.setOnLongClickListener(new View.OnLongClickListener() {
- public boolean onLongClick(View v) {
- // check for time-based lockouts
- if (mPasswordEntry.isEnabled()) {
- mPasswordEntry.setText("");
- }
- doHapticKeyClick();
- return true;
- }
- });
- }
-
- mPasswordEntry.setKeyListener(DigitsKeyListener.getInstance());
- mPasswordEntry.setInputType(InputType.TYPE_CLASS_NUMBER
- | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
-
- mPasswordEntry.requestFocus();
}
@Override