Merge "Stop the blinking caret when moving to another field." (5bf4bb97) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -8022,18 +8022,17 @@ public class WebView extends AbsoluteLayout
		/*
		* Send a mouse move event to the webcore thread.
		*
		* @param removeFocus Pass true if the "mouse" cursor is now over a node
		* which wants key events, but it is not the focus. This
		* will make the visual appear as though nothing is in
		* focus. Remove the WebTextView, if present, and stop
		* drawing the blinking caret.
		* @param removeFocus Pass true to remove the WebTextView, if present.
		* @param stopPaintingCaret Stop drawing the blinking caret if true.
		* called by JNI
		*/
		private void sendMoveMouseIfLatest(boolean removeFocus) {
		@SuppressWarnings("unused")
		private void sendMoveMouseIfLatest(boolean removeFocus, boolean stopPaintingCaret) {
		if (removeFocus) {
		clearTextEntry();
		}
		mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE_IF_LATEST,
		stopPaintingCaret ? 1 : 0, 0,
		cursorData());
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -558,7 +558,7 @@ final class WebViewCore {
		private native String nativeRetrieveHref(int x, int y);
		private native String nativeRetrieveAnchorText(int x, int y);
		private native String nativeRetrieveImageSource(int x, int y);

		private native void nativeStopPaintingCaret();
		private native void nativeTouchUp(int touchGeneration,
		int framePtr, int nodePtr, int x, int y);

		@@ -1381,6 +1381,9 @@ final class WebViewCore {
		nativeMoveMouseIfLatest(cData.mMoveGeneration,
		cData.mFrame,
		cData.mX, cData.mY);
		if (msg.arg1 == 1) {
		nativeStopPaintingCaret();
		}
		break;

		case REQUEST_CURSOR_HREF: {