From 6e4eb094bf2feb9be4f5d2d73b1186aed768539b Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@mapbox.com>
Date: Wed, 30 Dec 2015 15:27:42 -0800
Subject: [PATCH] [android] Fix zoom gestures when scrolling is disabled Fixes
 #3421

---
 .../src/main/java/com/mapbox/mapboxsdk/views/MapView.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index 392b26ed8..d3b356fd6 100644
--- 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 {