Merge "Don't draw the focus ring if we don't have focus" (39aae0ce) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewClassic.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -5747,6 +5747,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		setFocusControllerActive(false);
		mKeysPressed.clear();
		}
		if (!mTouchHighlightRegion.isEmpty()) {
		mWebView.invalidate(mTouchHighlightRegion.getBounds());
		}
		}

		void setGLRectViewport() {
		@@ -5958,6 +5961,10 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		return false;
		}

		if (!mWebView.isFocused()) {
		mWebView.requestFocus();
		}

		if (DebugFlags.WEB_VIEW) {
		Log.v(LOGTAG, ev + " at " + ev.getEventTime()
		+ " mTouchMode=" + mTouchMode
		@@ -6347,7 +6354,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		break;
		}
		case MotionEvent.ACTION_UP: {
		if (!mWebView.isFocused()) mWebView.requestFocus();
		// pass the touch events from UI thread to WebCore thread
		if (shouldForwardTouchEvent()) {
		TouchEventData ted = new TouchEventData();
		@@ -8519,7 +8525,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		return false;
		}
		if (mFocusedNode.mHasFocus && !mWebView.isInTouchMode()) {
		return !mFocusedNode.mEditable;
		return mDrawCursorRing && !mFocusedNode.mEditable;
		}
		if (mFocusedNode.mHasFocus && mFocusedNode.mEditable) {
		return false;