Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-31 16:59:19 +01:00
commit c9b7314c1e

View file

@ -862,7 +862,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
layers.get(i).onTouchEvent(event, getCurrentRotatedTileBox());
}
}
if (!doubleTapScaleDetector.isInZoomMode()) {
if (!doubleTapScaleDetector.isInZoomMode() && !doubleTapScaleDetector.isDoubleTapping()) {
gestureDetector.onTouchEvent(event);
}
return true;