diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-06-25 10:00:18 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-06-25 10:00:18 +0200 |
commit | 871f82dceb1977c808898097085e187fff8551bf (patch) | |
tree | 1450afadcb5f8263f08fb4b55ed822cc2623239b /platform | |
parent | 76f9c1ac026c2505b2eb09dbb70c6553389cf3e2 (diff) | |
download | qtlocation-mapboxgl-871f82dceb1977c808898097085e187fff8551bf.tar.gz |
[android] #5479 - Don't disable rotate gesture if we have tracking disabled
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java index 30492bc421..f2a49f102b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java @@ -101,7 +101,7 @@ public class TrackingSettings { * * @return True to indicate the tracking modes will be dismissed. * @deprecated use @link #isAllDismissTrackingOnGestureinstead - */ + */ @Deprecated public boolean isDismissTrackingOnGesture() { return dismissLocationTrackingOnGesture && dismissBearingTrackingOnGesture; @@ -215,7 +215,7 @@ public class TrackingSettings { private void validateGesturesForBearingTrackingMode() { int myBearingTrackingMode = getMyBearingTrackingMode(); if (!dismissBearingTrackingOnGesture) { - if (myBearingTrackingMode == MyBearingTracking.NONE) { + if (myBearingTrackingMode == MyBearingTracking.NONE || myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) { uiSettings.setRotateGesturesEnabled(true); } else { uiSettings.setRotateGesturesEnabled(false); |