Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a bug where the numpad wasn\'t working correctly" into nyc-dev

Browse Source 
am: 1a3ca220f7

* commit '1a3ca220f72b44e56d4bdfa820c4274a093af228':
  Fixed a bug where the numpad wasn't working correctly
This commit is contained in:
Selim Cinek
2016-02-23 01:17:53 +00:00
committed by android-build-merger
parent b0ae47f4a2 1a3ca220f7
commit 936778e600
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/view/KeyEvent.java
View File

@@ -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;

7
packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java
View File

@@ -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;
}