summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-10-12 15:56:31 -0700
committerAdam Powell <adamp@google.com>2010-10-12 15:56:31 -0700
commitd7bd2eb0321936e377592be9039de957b8794ab1 (patch)
treedcc2a2902ace4c313631c7bc676f12a3e57d20df /core/java/android
parentfb6431c0298747d240fcdc025575e5f46db95132 (diff)
downloadframeworks_base-d7bd2eb0321936e377592be9039de957b8794ab1.zip
frameworks_base-d7bd2eb0321936e377592be9039de957b8794ab1.tar.gz
frameworks_base-d7bd2eb0321936e377592be9039de957b8794ab1.tar.bz2
Fix bug 3083631 - Links no longer get tapped during scale gestures
Change-Id: I57bf740c5063f30d763fc720a3ad77edff20f867
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/webkit/WebView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6df5445..84aca60 100644
--- 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();