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

am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.

Browse Source 
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp

* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
  DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
This commit is contained in:
Derek Sollenberger
2010-09-01 06:12:16 -07:00
committed by Android Git Automerger
parent 3e25a82406 73ef5d4e2b
commit 0171bfba04
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/webkit/WebView.java
View File

@@ -3911,6 +3911,19 @@ public class WebView extends AbsoluteLayout
// affect long press with the trackball/touch.
private boolean mGotCenterDown = false;
@Override
public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
// send complex characters to webkit for use by JS and plugins
if (keyCode == KeyEvent.KEYCODE_UNKNOWN && event.getCharacters() != null) {
// pass the key to DOM
mWebViewCore.sendMessage(EventHub.KEY_DOWN, event);
mWebViewCore.sendMessage(EventHub.KEY_UP, event);
// return true as DOM handles the key
return true;
}
return false;
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (DebugFlags.WEB_VIEW) {

13
core/java/android/webkit/WebViewCore.java
View File

@@ -1568,9 +1568,16 @@ final class WebViewCore {
+ evt);
}
int keyCode = evt.getKeyCode();
if (!nativeKey(keyCode, evt.getUnicodeChar(),
evt.getRepeatCount(), evt.isShiftPressed(), evt.isAltPressed(),
evt.isSymPressed(),
int unicodeChar = evt.getUnicodeChar();
if (keyCode == KeyEvent.KEYCODE_UNKNOWN && evt.getCharacters() != null
&& evt.getCharacters().length() > 0) {
// we should only receive individual complex characters
unicodeChar = evt.getCharacters().codePointAt(0);
}
if (!nativeKey(keyCode, unicodeChar, evt.getRepeatCount(), evt.isShiftPressed(),
evt.isAltPressed(), evt.isSymPressed(),
isDown) && keyCode != KeyEvent.KEYCODE_ENTER) {
if (keyCode >= KeyEvent.KEYCODE_DPAD_UP
&& keyCode <= KeyEvent.KEYCODE_DPAD_RIGHT) {