am 2cd50c9d: Merge "Don\'t long press if preventDefault is called" into jb-dev

* commit '2cd50c9d556de341217044f40be001050a15a741': Don't long press if preventDefault is called
2012-05-29 16:26:12 -07:00
parent 03ab4eb550 2cd50c9d55
commit 4a53b51955
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/webkit/WebViewInputDispatcher.java
+++ b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -661,6 +661,7 @@ final class WebViewInputDispatcher {
                        // Web kit has decided to consume the event!
                        if (d.mEventType == EVENT_TYPE_TOUCH) {
                            enqueueUiCancelTouchEventIfNeededLocked();
+                            unscheduleLongPressLocked();
                        }
                    } else {
                        // Web kit is being friendly.  Pass the event to the UI.