From fbdfc46df0756f1454f9ce7ec95403f523972ae4 Mon Sep 17 00:00:00 2001 From: Hardy Date: Mon, 2 Jan 2017 08:57:44 +0100 Subject: [PATCH] test-revert some otimizations --- .../net/osmand/plus/views/MultiTouchSupport.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java index f67352cbda..9dea3a489a 100644 --- a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java +++ b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java @@ -111,13 +111,13 @@ public class MultiTouchSupport { angleStarted = angle; inZoomMode = true; return true; - // End only on second-last pointer up, see above - //} else if(actionCode == ACTION_POINTER_UP){ - // if(inZoomMode){ - // listener.onZoomOrRotationEnded(zoomRelative, angleRelative); - // inZoomMode = false; - // } - // return true; + // End only on second-last pointer up, see above? + } else if(actionCode == ACTION_POINTER_UP){ + if(inZoomMode){ + listener.onZoomOrRotationEnded(zoomRelative, angleRelative); + inZoomMode = false; + } + return true; } else if(inZoomMode && actionCode == MotionEvent.ACTION_MOVE){ // Keep zoom center fixed or flexible centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2); @@ -132,7 +132,7 @@ public class MultiTouchSupport { } catch (Exception e) { log.debug("Multi touch exception" , e); //$NON-NLS-1$ } - return true; + return false; } public PointF getCenterPoint() {