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

Merge commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp

* commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
This commit is contained in:
Adam Powell
2010-10-12 17:11:51 -07:00
committed by Android Git Automerger

View File

@@ -5057,6 +5057,8 @@ public class WebView extends AbsoluteLayout
if (!mAllowPanAndScale) { if (!mAllowPanAndScale) {
return true; return true;
} }
mPrivateHandler.removeMessages(SWITCH_TO_SHORTPRESS);
mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
} }
x = mScaleDetector.getFocusX(); x = mScaleDetector.getFocusX();
y = mScaleDetector.getFocusY(); y = mScaleDetector.getFocusY();