diff options
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 1 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 51e1f4baae97..e0c6770ecb38 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1780,6 +1780,7 @@ public class KeyEvent extends InputEvent implements Parcelable { case KeyEvent.KEYCODE_DPAD_CENTER: case KeyEvent.KEYCODE_ENTER: case KeyEvent.KEYCODE_SPACE: + case KeyEvent.KEYCODE_NUMPAD_ENTER: return true; default: return false; diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java index cedd88d44807..fe98cb876854 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -89,7 +89,12 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView return true; } if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) { - int number = keyCode - KeyEvent.KEYCODE_0 ; + int number = keyCode - KeyEvent.KEYCODE_0; + performNumberClick(number); + return true; + } + if (keyCode >= KeyEvent.KEYCODE_NUMPAD_0 && keyCode <= KeyEvent.KEYCODE_NUMPAD_9) { + int number = keyCode - KeyEvent.KEYCODE_NUMPAD_0; performNumberClick(number); return true; } |