[android] - validate if gestures should execute (#9173)

This commit is contained in:
Tobrun
2017-06-02 12:39:35 +02:00
committed by GitHub
parent 3b837d93ad
commit da53200704

View File

@@ -383,6 +383,14 @@ final class MapGestureDetector {
// Called for drags
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
return false;
}
if (dragStarted) {
return false;
}
if (!scrollInProgress) {
scrollInProgress = true;
@@ -393,13 +401,6 @@ final class MapGestureDetector {
getLocationFromGesture(e1.getX(), e1.getY()),
MapboxEvent.GESTURE_PAN_START, transform));
}
if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
return false;
}
if (dragStarted) {
return false;
}
// reset tracking if needed
trackingSettings.resetTrackingModesIfRequired(true, false, false);