Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-12-29 16:42:13 +01:00
commit c8b87fdda7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/MultiTouchSupport.java
View file

@ -40,7 +40,7 @@ public class MultiTouchSupport {
private float scale = 1; private float scale = 1;
private PointF centerPoint = new PointF(); private PointF centerPoint = new PointF();
private boolean multiTouch; private boolean multiTouch = false;
public MultiTouchSupport(Context ctx, MultiTouchZoomListener listener) { public MultiTouchSupport(Context ctx, MultiTouchZoomListener listener) {
this.ctx = ctx; this.ctx = ctx;
@ -119,14 +119,15 @@ public class MultiTouchSupport {
listener.onGestureInit(x1, y1, x2, y2); listener.onGestureInit(x1, y1, x2, y2);
return true; return true;
} }
case MotionEvent.ACTION_POINTER_UP: { // End only on second-last pointer up, see above
//case MotionEvent.ACTION_POINTER_UP: {
if (inZoomMode || inTiltMode) { // if (inZoomMode || inTiltMode) {
listener.onGestureFinished(scale, rotation); // listener.onGestureFinished(scale, rotation);
inZoomMode = false; // inZoomMode = false;
inTiltMode = false; // inTiltMode = false;
} // }
return true; // return true;
} }
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {