From aa86ac82bc296931d4de6715fa966be8d0f8af2f Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Tue, 28 Dec 2010 11:30:18 -0500 Subject: map keyboard for webview Treat the numeric keypad enter as the regular enter for the purposes of completing a text entry or activating the currently selected link. Add a little keyboard-related debugging. Don't call select text to extend the selection if the tap point hasn't moved. A separate change to the Browser app adds more keyboard accelerators. bug:3270434 bug:3191699 Change-Id: I8a38b26196e93e344dc2a4b39a6968fe0c158d47 --- core/java/android/webkit/WebTextView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/java/android/webkit/WebTextView.java') diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index bb18270efa01..cf447dbfbe03 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -238,7 +238,8 @@ import junit.framework.Assert; } } - if ((mSingle && KeyEvent.KEYCODE_ENTER == keyCode)) { + if (mSingle && (KeyEvent.KEYCODE_ENTER == keyCode + || KeyEvent.KEYCODE_NUMPAD_ENTER == keyCode)) { if (isPopupShowing()) { return super.dispatchKeyEvent(event); } @@ -296,7 +297,8 @@ import junit.framework.Assert; // so do not pass down to javascript, and instead // return true. If it is an arrow key or a delete key, we can go // ahead and pass it down. - if (KeyEvent.KEYCODE_ENTER == keyCode) { + if (KeyEvent.KEYCODE_ENTER == keyCode + || KeyEvent.KEYCODE_NUMPAD_ENTER == keyCode) { // For multi-line text boxes, newlines will // trigger onTextChanged for key down (which will send both // key up and key down) but not key up. -- cgit v1.2.3