diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-11-14 10:37:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-14 10:37:34 +0100 |
commit | fa6d5864177bfb68e99f8732068a3402cc5aadfd (patch) | |
tree | c1e498a0858795e2eb2c7c7cf5d3c46c54503ebc /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java | |
parent | a7fa97e8a36bec7c5d6ec5ae43203012e3357cd9 (diff) | |
download | qtlocation-mapboxgl-fa6d5864177bfb68e99f8732068a3402cc5aadfd.tar.gz |
[android] - allow using rotate gesture when not tracking user location, correctly update bearing during rotation gesture (#6978)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java | 2 |
1 files changed, 1 insertions, 1 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 474af19853..c32d4a8906 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 @@ -199,7 +199,7 @@ public class TrackingSettings { // The user settings are enabled AND; // EITHER bearing tracking is dismissed on gesture OR there is no bearing tracking return uiSettings.isRotateGesturesEnabled() && - (dismissBearingTrackingOnGesture || myBearingTrackingMode == MyBearingTracking.NONE); + (dismissBearingTrackingOnGesture || myBearingTrackingMode == MyBearingTracking.NONE || (myLocationTrackingMode == MyLocationTracking.TRACKING_NONE)); } /** |