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

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

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

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