Fix 2673731: Added password history

Change-Id: I6198833e099ec1f33309dc26b28e0fd4a6edb288

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b5e72d7..97b1317 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -249,6 +249,10 @@ public class ChooseLockPassword extends Activity implements OnClickListener, OnE
                 return getString(R.string.lockpassword_password_requires_symbol);
             }
         }
+        if(mLockPatternUtils.checkPasswordHistory(password)) {
+            return getString(mIsAlphaMode ? R.string.lockpassword_password_recently_used
+                    : R.string.lockpassword_pin_recently_used);
+        }
         return null;
     }
 
@@ -306,7 +310,7 @@ public class ChooseLockPassword extends Activity implements OnClickListener, OnE
 
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         // Check if this was the result of hitting the enter key
-        if (actionId == EditorInfo.IME_NULL) {
+        if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN) {
             handleNext();
             return true;
         }