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 10:52:33 +01:00
commit fbbad4b0c0
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
View file

@ -86,7 +86,7 @@ public class MultiTouchSupport {
Integer pointCount = (Integer) getPointerCount.invoke(event); Integer pointCount = (Integer) getPointerCount.invoke(event);
if(pointCount < 2){ if(pointCount < 2){
if(inZoomMode){ if(inZoomMode){
//listener.onZoomOrRotationEnded(zoomRelative, angleRelative); listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false; inZoomMode = false;
return true; return true;
} }

6
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -862,6 +862,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
layers.get(i).onTouchEvent(event, getCurrentRotatedTileBox()); layers.get(i).onTouchEvent(event, getCurrentRotatedTileBox());
} }
gestureDetector.onTouchEvent(event); gestureDetector.onTouchEvent(event);
} else {
MotionEvent cancelEvent == MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 100, MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0);
for (int i = layers.size() - 1; i >= 0; i--) {
layers.get(i).onTouchEvent(cancelEvent, getCurrentRotatedTileBox());
}
gestureDetector.onTouchEvent(cancelEvent);
} }
return true; return true;
} }