Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b45a2633 authored by Leon Scroggins's avatar Leon Scroggins
Browse files

Differentiate between clicks for focus and actual clicks. 

Bug:3344162

Requires a change in external/webkit.

Change-Id: I6650a3084926fe4c241ccd7deca146e44460f29c
parent 92a9a3c5

core/java/android/webkit/WebView.java

+2 −2
Original line number Diff line number Diff line
@@ -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

core/java/android/webkit/WebViewCore.java

+8 −3
Original line number Diff line number Diff line
@@ -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: {