Bug 960146. r=kats

This commit is contained in:
Wes Johnston 2014-03-07 08:32:22 -08:00
parent 971bff0811
commit e2958d9688

View File

@ -220,12 +220,14 @@ final class TouchEventHandler implements Tabs.OnTabsChangedListener {
* Dispatch the event to the gesture detectors and the pan/zoom controller.
*/
private void dispatchEvent(MotionEvent event, boolean allowDefaultAction) {
if (mGestureDetector.onTouchEvent(event)) {
return;
}
mScaleGestureDetector.onTouchEvent(event);
if (mScaleGestureDetector.isInProgress()) {
return;
if (allowDefaultAction) {
if (mGestureDetector.onTouchEvent(event)) {
return;
}
mScaleGestureDetector.onTouchEvent(event);
if (mScaleGestureDetector.isInProgress()) {
return;
}
}
mPanZoomController.handleEvent(event, !allowDefaultAction);
}