Merge "Don't long press if preventDefault is called" into jb-dev

jreck · Android (Google) Code Review · commit 2cd50c9d556d · 2012-05-29T16:23:10.000-07:00
diff --git a/core/java/android/webkit/WebViewInputDispatcher.java b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -661,6 +661,7 @@ private void dispatchWebKitEvents(boolean calledFromHandler) {
                         // 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.

Original file line number	Diff line number	Diff line change
`@@ -661,6 +661,7 @@ private void dispatchWebKitEvents(boolean calledFromHandler) {`
`661`	`661`	`// Web kit has decided to consume the event!`
`662`	`662`	`if (d.mEventType == EVENT_TYPE_TOUCH) {`
`663`	`663`	`enqueueUiCancelTouchEventIfNeededLocked();`
	`664`	`+ unscheduleLongPressLocked();`
`664`	`665`	`}`
`665`	`666`	`} else {`
`666`	`667`	`// Web kit is being friendly. Pass the event to the UI.`