[android] Fix zoom gestures when scrolling is disabled

Fixes #3421
2015-12-30 15:27:42 -08:00
parent e6dc4fe49d
commit 6e4eb094bf
1 changed files with 1 additions and 1 deletions
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -3123,7 +3123,7 @@ public final class MapView extends FrameLayout {
            mQuickZoom = !mTwoTap;

            // Scale the map
-            if (!mQuickZoom && mUserLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE) {
+            if (mScrollEnabled && !mQuickZoom && mUserLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE) {
                // around gesture
                mNativeMapView.scaleBy(detector.getScaleFactor(), detector.getFocusX() / mScreenDensity, detector.getFocusY() / mScreenDensity);
            } else {