Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-31 15:56:37 +01:00
commit 76bab5c7c9

View file

@ -1114,7 +1114,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true);
if (!(multiTouchSupport.isInZoomMode()) {
dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true);
}
return true;
}