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

Remove trackball double click. Treat each click as a single click.

Browse Source
This commit is contained in:
Grace Kloba
2009-09-14 10:17:06 -07:00
parent 31504f0bf4
commit dd8174928c
1 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,8 +458,7 @@ public class WebView extends AbsoluteLayout
private static final int SWITCH_TO_LONGPRESS = 4; private static final int SWITCH_TO_LONGPRESS = 4;
private static final int RELEASE_SINGLE_TAP = 5; private static final int RELEASE_SINGLE_TAP = 5;
private static final int REQUEST_FORM_DATA = 6; private static final int REQUEST_FORM_DATA = 6;
private static final int SWITCH_TO_CLICK = 7; private static final int RESUME_WEBCORE_UPDATE = 7;
private static final int RESUME_WEBCORE_UPDATE = 8;
//! arg1=x, arg2=y //! arg1=x, arg2=y
static final int SCROLL_TO_MSG_ID = 10; static final int SCROLL_TO_MSG_ID = 10;
@@ -3664,16 +3663,27 @@ public class WebView extends AbsoluteLayout
if (mShiftIsPressed) { if (mShiftIsPressed) {
return false; return false;
} }
if (getSettings().supportZoom()
&& mTouchMode == TOUCH_DOUBLECLICK_MODE) { // perform the single click
zoomScrollOut(); Rect visibleRect = sendOurVisibleRect();
} else { // Note that sendOurVisibleRect calls viewToContent, so the
mPrivateHandler.sendMessageDelayed(mPrivateHandler // coordinates should be in content coordinates.
.obtainMessage(SWITCH_TO_CLICK), TAP_TIMEOUT); if (!nativeCursorIntersects(visibleRect)) {
if (DebugFlags.WEB_VIEW) { return false;
Log.v(LOGTAG, "TOUCH_DOUBLECLICK_MODE"); }
} nativeSetFollowedLink(true);
mTouchMode = TOUCH_DOUBLECLICK_MODE; nativeUpdatePluginReceivesEvents();
WebViewCore.CursorData data = cursorData();
mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, data);
playSoundEffect(SoundEffectConstants.CLICK);
boolean isTextInput = nativeCursorIsTextInput();
if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading(
nativeCursorText())) {
mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame,
nativeCursorNodePointer());
}
if (isTextInput) {
rebuildWebTextView();
} }
return true; return true;
} }
@@ -4321,7 +4331,6 @@ public class WebView extends AbsoluteLayout
return true; return true;
} }
if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mPrivateHandler.removeMessages(SWITCH_TO_CLICK);
mTrackballDown = true; mTrackballDown = true;
if (mNativeClass == 0) { if (mNativeClass == 0) {
return false; return false;
@@ -5184,32 +5193,6 @@ public class WebView extends AbsoluteLayout
} }
break; 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
// coordinates should be in content coordinates.
if (!nativeCursorIntersects(visibleRect)) {
break;
}
nativeSetFollowedLink(true);
nativeUpdatePluginReceivesEvents();
WebViewCore.CursorData data = cursorData();
mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, data);
playSoundEffect(SoundEffectConstants.CLICK);
boolean isTextInput = nativeCursorIsTextInput();
if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading(
nativeCursorText())) {
mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame,
nativeCursorNodePointer());
}
if (isTextInput) {
rebuildWebTextView();
}
break;
case SCROLL_BY_MSG_ID: case SCROLL_BY_MSG_ID:
setContentScrollBy(msg.arg1, msg.arg2, (Boolean) msg.obj); setContentScrollBy(msg.arg1, msg.arg2, (Boolean) msg.obj);
break; break;