diff options
| author | Adam Powell <adamp@google.com> | 2010-10-12 17:08:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-12 17:08:43 -0700 |
| commit | c417612a1abb6281697a9738a1a19eb8814ae8a6 (patch) | |
| tree | f6da01e2887846eab71836c4254d1a5db839267e /core | |
| parent | 1bc3a407ceb380e35e894f405f544b5b87e980d4 (diff) | |
| parent | d7bd2eb0321936e377592be9039de957b8794ab1 (diff) | |
| download | frameworks_base-c417612a1abb6281697a9738a1a19eb8814ae8a6.zip frameworks_base-c417612a1abb6281697a9738a1a19eb8814ae8a6.tar.gz frameworks_base-c417612a1abb6281697a9738a1a19eb8814ae8a6.tar.bz2 | |
Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
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(); |