diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-23 01:12:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-23 01:12:52 +0000 |
| commit | b22931a0fb6c9dec67a916636f7b326e4554fb82 (patch) | |
| tree | 3c13ffe0831bd2d5b86e53b343c5bcf3d075a725 /core/java/android/widget/TextView.java | |
| parent | f6f8deea321d8cfdd42f6f814a35f749e7dbee41 (diff) | |
| parent | 975a5f7aa54901b41576cad2d5d3c4bfc266c3d9 (diff) | |
Merge "Process numpad enter key along with enter key." into rvc-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e933f18af979..ec07574f141f 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8359,6 +8359,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 @@ -8586,6 +8587,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 |