1 files changed, 24 insertions, 7 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
index 8b6b93e03a..24da59bb7e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
@@ -51,6 +51,7 @@ import timber.log.Timber;
  */
 public class MyLocationView extends View {
 
+  private static final int UNDEFINED_TINT_COLOR = -1;
   private MyLocationBehavior myLocationBehavior;
   private MapboxMap mapboxMap;
 
@@ -198,12 +199,8 @@ public class MyLocationView extends View {
    * @param color The color to tint the drawable with
    */
   public final void setForegroundDrawableTint(@ColorInt int color) {
-    if (foregroundDrawable != null) {
-      foregroundDrawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-    }
-    if (foregroundBearingDrawable != null) {
-      foregroundBearingDrawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-    }
+    applyDrawableTint(foregroundDrawable, color);
+    applyDrawableTint(foregroundBearingDrawable, color);
     invalidate();
   }
 
@@ -247,7 +244,7 @@ public class MyLocationView extends View {
     if (backgroundDrawable == null) {
       return;
     }
-    backgroundDrawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    applyDrawableTint(backgroundDrawable, color);
     invalidate();
   }
 
@@ -737,6 +734,26 @@ public class MyLocationView extends View {
     setEnabled(isEnabled(), locationSource != null);
   }
 
+  private void applyDrawableTint(Drawable drawable, @ColorInt int color) {
+    if (color == UNDEFINED_TINT_COLOR) {
+      removeTintColorFilter(drawable);
+    } else {
+      applyTintColorFilter(drawable, color);
+    }
+  }
+
+  private void removeTintColorFilter(Drawable drawable) {
+    if (drawable != null) {
+      drawable.mutate().setColorFilter(null);
+    }
+  }
+
+  private void applyTintColorFilter(Drawable drawable, @ColorInt int color) {
+    if (drawable != null) {
+      drawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    }
+  }
+
   private static class GpsLocationListener implements LocationEngineListener {
 
     private WeakReference<MyLocationView> userLocationView;