diff options
author | Tobrun <tobrun@mapbox.com> | 2017-06-02 12:39:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-02 12:39:35 +0200 |
commit | da532007043b1827e83686faca0de2a45c4ef730 (patch) | |
tree | 99db2196a7871de49b3637c93d9ac4d1fefd7b56 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java | |
parent | 3b837d93ada899d75b3ef3cc19303bebcb5db64c (diff) | |
download | qtlocation-mapboxgl-da532007043b1827e83686faca0de2a45c4ef730.tar.gz |
[android] - validate if gestures should execute (#9173)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java index e60f9b1d1e..33e13c5ecc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java @@ -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); |