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

Commit e60cb7f9 authored by Cary Clark's avatar Cary Clark
Browse files

simplify cursor ring draw state; fix null check 

Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.

Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.

Requires a companion change in external/webkit

http://b/2135321 (rename jni call)
http://b/2945171 (null check)

Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
parent 7a9f6faa

core/java/android/webkit/WebView.java

+6 −4
Original line number Diff line number Diff line
@@ -3355,7 +3355,8 @@ public class WebView extends AbsoluteLayout 
        setUpSelect();

        if (mNativeClass != 0 && nativeWordSelection(x, y)) {

            nativeSetExtendSelection();

            getWebChromeClient().onSelectionStart(this);

            WebChromeClient client = getWebChromeClient();

            if (client != null) client.onSelectionStart(this);

            return true;

        }

        notifySelectDialogDismissed();
@@ -4088,7 +4089,7 @@ public class WebView extends AbsoluteLayout 
                return true;

            }

            clearTextEntry();

            nativeSetFollowedLink(true);

            nativeShowCursorTimed();

            if (!mCallbackProxy.uiOverrideUrlLoading(nativeCursorText())) {

                mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame,

                        nativeCursorNodePointer());
@@ -4175,7 +4176,8 @@ public class WebView extends AbsoluteLayout 
     */

    public void selectionDone() {

        if (mSelectingText) {

            getWebChromeClient().onSelectionDone(this);

            WebChromeClient client = getWebChromeClient();

            if (client != null) client.onSelectionDone(this);

            invalidate(); // redraw without selection

            notifySelectDialogDismissed();

        }
@@ -7327,9 +7329,9 @@ public class WebView extends AbsoluteLayout 
    private native void     nativeSetExtendSelection();

    private native void     nativeSetFindIsEmpty();

    private native void     nativeSetFindIsUp(boolean isUp);

    private native void     nativeSetFollowedLink(boolean followed);

    private native void     nativeSetHeightCanMeasure(boolean measure);

    private native void     nativeSetBaseLayer(int layer);

    private native void     nativeShowCursorTimed();

    private native void     nativeReplaceBaseContent(int content);

    private native void     nativeCopyBaseContentToPicture(Picture pict);

    private native boolean  nativeHasContent();