From 656eb8766c147f4429115b8431511d6213859684 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 8 Jan 2016 17:18:49 +0100 Subject: [PATCH] [android] #3481 - add check to enable location in tracking mode --- .../src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 17627d304..4d423405e 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 @@ -178,7 +178,7 @@ public final class MapView extends FrameLayout { /** * The currently supported maximum and minimum tilt values. * - * @see MapView#setTilt(double) + * @see MapView#setTilt(Double, Long) */ private static final double MINIMUM_TILT = 0; private static final double MAXIMUM_TILT = 60; @@ -3933,7 +3933,8 @@ public final class MapView extends FrameLayout { Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}) public void setMyLocationTrackingMode(@MyLocationTracking.Mode int myLocationTrackingMode) { - if(!isMyLocationEnabled()){ + if(myLocationTrackingMode!=MyLocationTracking.TRACKING_NONE && !isMyLocationEnabled()){ + //noinspection ResourceType setMyLocationEnabled(true); } @@ -3989,7 +3990,8 @@ public final class MapView extends FrameLayout { Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}) public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) { - if(!isMyLocationEnabled()){ + if(myBearingTrackingMode!=MyBearingTracking.NONE && !isMyLocationEnabled()){ + //noinspection ResourceType setMyLocationEnabled(true); }