Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4359

Browse Source 
* changes:
  Allow proper text editing after clicking with the trackball.
This commit is contained in:
Android (Google) Code Review
2009-06-16 13:02:50 -07:00
parent b0b160ae50 1bd0d6a53f
commit f0176b5929
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/WebView.java
View File

@@ -4582,6 +4582,9 @@ public class WebView extends AbsoluteLayout
break;
}
case SWITCH_TO_CLICK:
// The user clicked with the trackball, and did not click a
// second time, so perform the action of a trackball single
// click
mTouchMode = TOUCH_DONE_MODE;
Rect visibleRect = sendOurVisibleRect();
// Note that sendOurVisibleRect calls viewToContent, so the
@@ -4593,9 +4596,14 @@ public class WebView extends AbsoluteLayout
mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE,
cursorData());
playSoundEffect(SoundEffectConstants.CLICK);
if (!mCallbackProxy.uiOverrideUrlLoading(nativeCursorText())) {
boolean isTextInput = nativeCursorIsTextInput();
if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading(
nativeCursorText())) {
mWebViewCore.sendMessage(EventHub.CLICK);
}
if (isTextInput) {
rebuildWebTextView();
}
break;
case SCROLL_BY_MSG_ID:
setContentScrollBy(msg.arg1, msg.arg2, (Boolean) msg.obj);