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

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebViewInputDispatcher.java b/core/java/android/webkit/WebViewInputDispatcher.java
index d118eacb3b00..feff16ec0443 100644
--- 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();