Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-03 12:52:33 +01:00
commit 84ac79c3e3

View file

@ -78,7 +78,7 @@ public class MultiTouchSupport {
private double zoomRelative = 1;
private PointF centerPoint = new PointF();
private final int mMoveZoomCenterSlop2 = ViewConfiguration.getScaledTouchSlop() * ViewConfiguration.getScaledTouchSlop() / 4;
private static final int mMoveZoomCenterSlop2 = ViewConfiguration.getScaledTouchSlop() * ViewConfiguration.getScaledTouchSlop() / 4;
private boolean mScrolling = false;
public boolean onTouchEvent(MotionEvent event){