Merge "Don't show the touch highlight for double taps" into jb-dev

2012-05-17 20:03:17 -07:00
parent 93563d21a9 aa5af8d004
commit 88b756cd24
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/webkit/WebViewInputDispatcher.java
+++ b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -553,12 +553,17 @@ final class WebViewInputDispatcher {
            mIsTapCandidate = true;
            mInitialDownX = event.getX();
            mInitialDownY = event.getY();
-            scheduleShowTapHighlightLocked();
            enqueueHitTestLocked(event);
+            if (mIsDoubleTapCandidate) {
+                hideTapCandidateLocked();
+            } else {
+                scheduleShowTapHighlightLocked();
+            }
        } else if (action == MotionEvent.ACTION_UP) {
            unscheduleLongPressLocked();
            if (isClickCandidateLocked(event)) {
                if (mIsDoubleTapCandidate) {
+                    hideTapCandidateLocked();
                    enqueueDoubleTapLocked(event);
                } else {
                    scheduleClickLocked();