Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3ca220 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

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

parents 3f94c21c ce2bd0fa

core/java/android/view/KeyEvent.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+6 −1
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
            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;

        }

        return super.onKeyDown(keyCode, event);

    }