commit d30d78f9d0ff761e5a314117fbf2f14ab76c5ed6
author Jim Miller <jaggies@google.com> Wed Oct 08 00:37:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 00:37:16 2014 +0000
tree fa6f754ab97d11a2adf872158e66f2c3aa5a2d38
parent f8b98b2f07156c5f86e9be5e87ecfe37e5053b69
parent 52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e

am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev

* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.

packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
index e6c9e6c..dfea166 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
@@ -295,8 +295,14 @@
     @Override
     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 || actionId == EditorInfo.IME_ACTION_DONE
-                || actionId == EditorInfo.IME_ACTION_NEXT) {
+        final boolean isSoftImeEvent = event == null
+                && (actionId == EditorInfo.IME_NULL
+                || actionId == EditorInfo.IME_ACTION_DONE
+                || actionId == EditorInfo.IME_ACTION_NEXT);
+        final boolean isKeyboardEnterKey = event != null
+                && KeyEvent.isConfirmKey(event.getKeyCode())
+                && event.getAction() == KeyEvent.ACTION_DOWN;
+        if (isSoftImeEvent || isKeyboardEnterKey) {
             verifyPasswordAndUnlock();
             return true;
         }