Automated import from //branches/master/...@142632,142632 (6e3835ff) · Commits · e / os / android_frameworks_base

core/java/android/webkit/TextDialog.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -341,10 +341,7 @@ import java.util.ArrayList;
		// trackball or auto-correct.
		mWebView.setSelection(start, start + before);
		}
		updateCachedTextfield();
		if (cannotUseKeyEvents) {
		return;
		}
		if (!cannotUseKeyEvents) {
		int length = events.length;
		for (int i = 0; i < length; i++) {
		// We never send modifier keys to native code so don't send them
		@@ -354,6 +351,8 @@ import java.util.ArrayList;
		}
		}
		}
		updateCachedTextfield();
		}

		@Override
		public boolean onTrackballEvent(MotionEvent event) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -3607,9 +3607,6 @@ public class WebView extends AbsoluteLayout
		WebViewCore.pauseUpdate(mWebViewCore);
		int contentX = viewToContent((int) x + mScrollX);
		int contentY = viewToContent((int) y + mScrollY);
		if (inEditingMode()) {
		mTextEntry.updateCachedTextfield();
		}
		nativeClearFocus(contentX, contentY);
		// remove the zoom anchor if there is any
		if (mZoomScale != 0) {
		@@ -3787,9 +3784,6 @@ public class WebView extends AbsoluteLayout
		mTouchMode = TOUCH_DONE_MODE;
		int contentX = viewToContent((int) mLastTouchX + mScrollX);
		int contentY = viewToContent((int) mLastTouchY + mScrollY);
		if (inEditingMode()) {
		mTextEntry.updateCachedTextfield();
		}
		nativeClearFocus(contentX, contentY);
		break;
		}
		@@ -4276,10 +4270,6 @@ public class WebView extends AbsoluteLayout
		int contentY = viewToContent((int) mLastTouchY + mScrollY);
		Rect rect = new Rect(contentX - mNavSlop, contentY - mNavSlop,
		contentX + mNavSlop, contentY + mNavSlop);
		// If we were already focused on a textfield, update its cache.
		if (inEditingMode()) {
		mTextEntry.updateCachedTextfield();
		}
		nativeSelectBestAt(rect);
		}