diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-12 14:11:24 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2011-01-12 14:13:28 -0500 |
| commit | b45a263343d9c17d36c43d0f195ab5480e4bfa35 (patch) | |
| tree | 68fb8c04e3bb6c8b5cec7818da0ac9fc2d4dcbc4 | |
| parent | 92a9a3c5ef9774863b4cee93d43b67582a02c2f0 (diff) | |
| download | frameworks_base-b45a263343d9c17d36c43d0f195ab5480e4bfa35.zip frameworks_base-b45a263343d9c17d36c43d0f195ab5480e4bfa35.tar.gz frameworks_base-b45a263343d9c17d36c43d0f195ab5480e4bfa35.tar.bz2 | |
Differentiate between clicks for focus and actual clicks.
Bug:3344162
Requires a change in external/webkit.
Change-Id: I6650a3084926fe4c241ccd7deca146e44460f29c
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5403bf7..b28a3f0 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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 diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 8d5e71a..2ea20ee 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -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: { |