Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-29 17:59:33 +01:00
commit 2acd2cbc61

View file

@ -857,11 +857,11 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
final boolean isMultiTouch = multiTouchSupport.onTouchEvent(event);
doubleTapScaleDetector.onTouchEvent(event);
if (!isMultiTouch && !doubleTapScaleDetector.isInZoomMode()) {
//if (!isMultiTouch && !doubleTapScaleDetector.isInZoomMode()) {
for (int i = layers.size() - 1; i >= 0; i--) {
layers.get(i).onTouchEvent(event, getCurrentRotatedTileBox());
}
}
//}
gestureDetector.onTouchEvent(event);
return true;
}