Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread

2010-10-12 17:08:43 -07:00
parent 1bc3a407ce d7bd2eb032
commit c417612a1a
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5039,6 +5039,8 @@ public class WebView extends AbsoluteLayout
                    if (!mAllowPanAndScale) {
                        return true;
                    }
+                    mPrivateHandler.removeMessages(SWITCH_TO_SHORTPRESS);
+                    mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
                }
                x = mScaleDetector.getFocusX();
                y = mScaleDetector.getFocusY();