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

am 1d60c5c1: Do not hide the cursor ring when clicking on an input field.

Browse Source 
Merge commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f' into eclair-mr2-plus-aosp

* commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f':
  Do not hide the cursor ring when clicking on an input field.
This commit is contained in:
Leon Scroggins
2009-10-23 08:43:18 -07:00
committed by Android Git Automerger
parent 5c73c3bce4 1d60c5c16b
commit 6e6dbc3f4d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3468,21 +3468,19 @@ public class WebView extends AbsoluteLayout
if (!nativeCursorIntersects(visibleRect)) { if (!nativeCursorIntersects(visibleRect)) {
return false; return false;
} }
nativeSetFollowedLink(true);
nativeUpdatePluginReceivesEvents(); nativeUpdatePluginReceivesEvents();
WebViewCore.CursorData data = cursorData(); WebViewCore.CursorData data = cursorData();
mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, data); mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, data);
playSoundEffect(SoundEffectConstants.CLICK); playSoundEffect(SoundEffectConstants.CLICK);
boolean isTextInput = nativeCursorIsTextInput(); if (nativeCursorIsTextInput()) {
if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading( rebuildWebTextView();
nativeCursorText())) { return true;
}
nativeSetFollowedLink(true);
if (!mCallbackProxy.uiOverrideUrlLoading(nativeCursorText())) {
mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame, mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame,
nativeCursorNodePointer()); nativeCursorNodePointer());
} }
if (isTextInput) {
rebuildWebTextView();
displaySoftKeyboard(true);
}
return true; return true;
} }