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

Merge "Differentiate between clicks for focus and actual clicks." into honeycomb

Browse Source
This commit is contained in:
Leon Scroggins
2011-01-12 12:01:31 -08:00
committed by Android (Google) Code Review
parent b5a4b5d300 b45a263343
commit 1415bb7a94
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4680,8 +4680,8 @@ public class WebView extends AbsoluteLayout
if (nativeCursorIsTextInput()) {
// This message will put the node in focus, for the DOM's notion
// of focus, and make the focuscontroller active
mWebViewCore.sendMessage(EventHub.CLICK, nativeCursorFramePointer(),
// of focus.
mWebViewCore.sendMessage(EventHub.FAKE_CLICK, nativeCursorFramePointer(),
nativeCursorNodePointer());
// This will bring up the WebTextView and put it in focus, for
// our view system's notion of focus

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

@@ -516,7 +516,7 @@ final class WebViewCore {
int repeatCount, boolean isShift, boolean isAlt, boolean isSym,
boolean isDown);
private native void nativeClick(int framePtr, int nodePtr);
private native void nativeClick(int framePtr, int nodePtr, boolean fake);
private native void nativeSendListBoxChoices(boolean[] choices, int size);
@@ -866,7 +866,7 @@ final class WebViewCore {
"CLICK", // = 118;
"SET_NETWORK_STATE", // = 119;
"DOC_HAS_IMAGES", // = 120;
"121", // = 121;
"FAKE_CLICK", // = 121;
"DELETE_SELECTION", // = 122;
"LISTBOX_CHOICES", // = 123;
"SINGLE_LISTBOX_CHOICE", // = 124;
@@ -924,6 +924,7 @@ final class WebViewCore {
static final int CLICK = 118;
static final int SET_NETWORK_STATE = 119;
static final int DOC_HAS_IMAGES = 120;
static final int FAKE_CLICK = 121;
static final int DELETE_SELECTION = 122;
static final int LISTBOX_CHOICES = 123;
static final int SINGLE_LISTBOX_CHOICE = 124;
@@ -1173,8 +1174,12 @@ final class WebViewCore {
key((KeyEvent) msg.obj, false);
break;
case FAKE_CLICK:
nativeClick(msg.arg1, msg.arg2, true);
break;
case CLICK:
nativeClick(msg.arg1, msg.arg2);
nativeClick(msg.arg1, msg.arg2, false);
break;
case VIEW_SIZE_CHANGED: {