From 975a5f7aa54901b41576cad2d5d3c4bfc266c3d9 Mon Sep 17 00:00:00 2001 From: Byungsung You Date: Thu, 12 Dec 2019 17:17:28 +0900 Subject: Process numpad enter key along with enter key. Some views define only KEYCODE_ENTER action not KEYCODE_NUMPAD_ENTER. because of this, when numpad enter key is pressed expected result is not shown. We are adding KEYCODE_NUMPAD_ENTER to be processed in the same way as KEYCODE_ENTER. Test: Check that adb shell input KEYCODE_NUMPAD_ENTER and adb shell input KEYCODE_ENTER Bug: b/141329038 Change-Id: I87b5159c4fe71eaf8501059249c79b7cfd1752fc --- core/java/android/widget/TextView.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/java/android/widget/TextView.java') diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e1783181457f..1d8305acb358 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8346,6 +8346,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener switch (keyCode) { case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_NUMPAD_ENTER: if (event.hasNoModifiers()) { // When mInputContentType is set, we know that we are // running in a "modern" cupcake environment, so don't need @@ -8573,6 +8574,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return super.onKeyUp(keyCode, event); case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_NUMPAD_ENTER: if (event.hasNoModifiers()) { if (mEditor != null && mEditor.mInputContentType != null && mEditor.mInputContentType.onEditorActionListener != null -- cgit v1.2.3