[android] - remove deprecated api around location and markerviewupstream/tvn-remove-deprecated-api

21 files changed, 36 insertions, 4423 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index 536f5d02ab..421b32da36 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -8,9 +8,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.UiThread;
 import android.text.TextUtils;
 
-import com.mapbox.android.core.location.LocationEngine;
-import com.mapbox.android.core.location.LocationEnginePriority;
-import com.mapbox.android.core.location.LocationEngineProvider;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.exceptions.MapboxConfigurationException;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
@@ -31,7 +28,6 @@ public final class Mapbox {
   private Context context;
   private String accessToken;
   private Boolean connected;
-  private LocationEngine locationEngine;
 
   /**
    * Get an instance of Mapbox.
@@ -47,21 +43,15 @@ public final class Mapbox {
   public static synchronized Mapbox getInstance(@NonNull Context context, @NonNull String accessToken) {
     if (INSTANCE == null) {
       Context appContext = context.getApplicationContext();
-      LocationEngineProvider locationEngineProvider = new LocationEngineProvider(context);
-      LocationEngine locationEngine = locationEngineProvider.obtainBestLocationEngineAvailable();
-      INSTANCE = new Mapbox(appContext, accessToken, locationEngine);
-      locationEngine.setPriority(LocationEnginePriority.NO_POWER);
-
+      INSTANCE = new Mapbox(appContext, accessToken);
       ConnectivityReceiver.instance(appContext);
     }
-
     return INSTANCE;
   }
 
-  Mapbox(@NonNull Context context, @NonNull String accessToken, LocationEngine locationEngine) {
+  Mapbox(@NonNull Context context, @NonNull String accessToken) {
     this.context = context;
     this.accessToken = accessToken;
-    this.locationEngine = locationEngine;
   }
 
   /**
@@ -134,16 +124,4 @@ public final class Mapbox {
     NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
     return (activeNetwork != null && activeNetwork.isConnected());
   }
-
-  /**
-   * Returns the location engine used by the SDK.
-   *
-   * @return the location engine configured
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead.
-   */
-  @Deprecated
-  public static LocationEngine getLocationEngine() {
-    return INSTANCE.locationEngine;
-  }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
deleted file mode 100644
index 3fd2fa4ebf..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import android.os.Parcelable;
-import android.support.annotation.FloatRange;
-import android.support.annotation.NonNull;
-
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-/**
- * Abstract builder class for composing custom MarkerView objects.
- * <p>
- * Extending this class requires implementing Parceable interface.
- * </p>
- *
- * @param <U> Type of the marker view to be composed.
- * @param <T> Type of the builder to be used for composing.
- * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
- * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
- */
-@Deprecated
-public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends BaseMarkerViewOptions<U, T>>
-  implements Parcelable {
-
-  protected LatLng position;
-  protected String snippet;
-  protected String title;
-  protected Icon icon;
-  protected boolean flat;
-  protected float anchorU = 0.5f;
-  protected float anchorV = 1f;
-  protected float infoWindowAnchorU = 0.5f;
-  protected float infoWindowAnchorV = 0.0f;
-  protected float rotation;
-  protected boolean visible = true;
-  protected boolean selected;
-  protected float alpha = 1.0f;
-
-  /**
-   * Default constructor
-   */
-  public BaseMarkerViewOptions() {
-  }
-
-  /**
-   * Set the geographical location of the MarkerView.
-   *
-   * @param position the location to position the {@link MarkerView}.
-   * @return the object for which the method was called.
-   */
-  public T position(@NonNull LatLng position) {
-    this.position = position;
-    return getThis();
-  }
-
-  /**
-   * Set the snippet of the MarkerView.
-   *
-   * @param snippet the snippet of the {@link MarkerView}.
-   * @return the object for which the method was called.
-   */
-  public T snippet(String snippet) {
-    this.snippet = snippet;
-    return getThis();
-  }
-
-  /**
-   * Set the title of the MarkerView.
-   *
-   * @param title the title of the {@link MarkerView}.
-   * @return the object for which the method was called.
-   */
-  public T title(String title) {
-    this.title = title;
-    return getThis();
-  }
-
-  /**
-   * Set the icon of the MarkerView.
-   *
-   * @param icon the icon of the {@link MarkerView}.
-   * @return the object for which the method was called.
-   */
-  public T icon(Icon icon) {
-    this.icon = icon;
-    return getThis();
-  }
-
-  /**
-   * Set the flat state of the MarkerView.
-   *
-   * @param flat the flat state of the {@link MarkerView}.
-   * @return the object for which the method was called.
-   */
-  public T flat(boolean flat) {
-    this.flat = flat;
-    return getThis();
-  }
-
-  /**
-   * Set the anchor of the {@link MarkerView}.
-   *
-   * @param u the u-value.
-   * @param v the v-value.
-   * @return the object for which the method was called.
-   */
-  public T anchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) {
-    this.anchorU = u;
-    this.anchorV = v;
-    return getThis();
-  }
-
-  /**
-   * Set the InfoWindow anchor of the {@link MarkerView}.
-   *
-   * @param u the u-value.
-   * @param v the v-values.
-   * @return the object for which the method was called.
-   */
-  public T infoWindowAnchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) {
-    this.infoWindowAnchorU = u;
-    this.infoWindowAnchorV = v;
-    return getThis();
-  }
-
-  /**
-   * Set the rotation of the {@link MarkerView}.
-   *
-   * @param rotation the rotation value.
-   * @return the object for which the method was called.
-   */
-  public T rotation(float rotation) {
-    this.rotation = rotation;
-    while (this.rotation > 360) {
-      this.rotation -= 360;
-    }
-    while (this.rotation < 0) {
-      this.rotation += 360;
-    }
-    return getThis();
-  }
-
-  /**
-   * Set the visibility state of the {@link MarkerView}.
-   *
-   * @param visible the visible state.
-   * @return the object for which the method was called.
-   */
-  public T visible(boolean visible) {
-    this.visible = visible;
-    return getThis();
-  }
-
-  /**
-   * Set the alpha of the {@link MarkerView}.
-   *
-   * @param alpha the alpha value.
-   * @return the object for which the method was called.
-   */
-  public T alpha(float alpha) {
-    this.alpha = alpha;
-    return getThis();
-  }
-
-  /**
-   * Get the geographical location of the {@link MarkerView}.
-   *
-   * @return the geographical location.
-   */
-  public LatLng getPosition() {
-    return position;
-  }
-
-  /**
-   * Get the snippet of the {@link MarkerView}.
-   *
-   * @return the snippet.
-   */
-  public String getSnippet() {
-    return snippet;
-  }
-
-  /**
-   * Get the title of the {@link MarkerView}.
-   *
-   * @return the title.
-   */
-  public String getTitle() {
-    return title;
-  }
-
-  /**
-   * Get the icon of the {@link MarkerView}.
-   *
-   * @return the icon.
-   */
-  public Icon getIcon() {
-    return icon;
-  }
-
-  /**
-   * Get the flat state of the {@link MarkerView}.
-   *
-   * @return the flat state.
-   */
-  public boolean isFlat() {
-    return flat;
-  }
-
-  /**
-   * Get the u-value of the {@link MarkerView} anchor.
-   *
-   * @return the u-value.
-   */
-  public float getAnchorU() {
-    return anchorU;
-  }
-
-  /**
-   * Get the v-value of the {@link MarkerView} anchor.
-   *
-   * @return the v-value.
-   */
-  public float getAnchorV() {
-    return anchorV;
-  }
-
-  /**
-   * Get the u-value of the MarkerView InfoWindow anchor.
-   *
-   * @return the u-value.
-   */
-  public float getInfoWindowAnchorU() {
-    return infoWindowAnchorU;
-  }
-
-  /**
-   * Get the v-value of the MarkerView InfoWindow anchor.
-   *
-   * @return the v-value.
-   */
-  public float getInfoWindowAnchorV() {
-    return infoWindowAnchorV;
-  }
-
-  /**
-   * Get the rotation of the MarkerView.
-   *
-   * @return the rotation value.
-   */
-  public float getRotation() {
-    return rotation;
-  }
-
-  /**
-   * Get the visibility state of the MarkerView.
-   *
-   * @return the visibility state.
-   */
-  public boolean isVisible() {
-    return visible;
-  }
-
-  /**
-   * Get the alpha of the MarkerView.
-   *
-   * @return the alpha value.
-   */
-  public float getAlpha() {
-    return alpha;
-  }
-
-  /**
-   * Get the instance of the object for which this method was called.
-   *
-   * @return the object for which the this method was called.
-   */
-  public abstract T getThis();
-
-  /**
-   * Get the MarkerView.
-   *
-   * @return the MarkerView created from this builder.
-   */
-  public abstract U getMarker();
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index 18f74cd990..7200f9cd43 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -16,10 +16,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
  * {@link LatLng} and using {@link MapboxMap#addMarker(MarkerOptions)}. The marker icon will be
  * centered at this position so it is common to add padding to the icon image before usage.
  * <p>
- * If more customization is needed, we offer {@link MarkerView} which places a {@link View} on top
- * of the map at a geographical location.
- * </p>
- * <p>
  * Markers are designed to be interactive. They receive click events by default, and are often used
  * with event listeners to bring up info windows. An {@link InfoWindow} is displayed by default when
  * either a title or snippet is provided.
@@ -56,11 +52,6 @@ public class Marker extends Annotation {
     this(baseMarkerOptions.position, baseMarkerOptions.icon, baseMarkerOptions.title, baseMarkerOptions.snippet);
   }
 
-  Marker(BaseMarkerViewOptions baseMarkerViewOptions) {
-    this(baseMarkerViewOptions.position, baseMarkerViewOptions.icon,
-      baseMarkerViewOptions.title, baseMarkerViewOptions.snippet);
-  }
-
   Marker(LatLng position, Icon icon, String title, String snippet) {
     this.position = position;
     this.title = title;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
deleted file mode 100644
index eb82c7bf53..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-
-/**
- * MarkerView is an annotation that shows a {@link android.view.View} at a geographical location. The
- * default marker uses a provided icon. This icon can be customized using {@link IconFactory} to
- * generate an {@link Icon} using a provided image. MarkerViews are added to the map by first giving
- * a {@link LatLng} and using {@link MapboxMap#addMarker(BaseMarkerViewOptions)}. The marker view icon
- * by default is anchored at the center bottom.
- * <p>
- * If many markers are needed to be displayed on the map at once we suggest using {@link Marker}
- * instead. This class uses {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter} to adapt a
- * MarkerView model to an Android SDK {@link android.view.View} object.
- * </p>
- * <p>
- * MarkerViews are designed to be interactive. They receive click events by default, and are often
- * used with event listeners to bring up info windows. An {@link InfoWindow} is displayed by default
- * when either a title or snippet is provided.
- * </p>
- * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
- * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
- */
-@Deprecated
-public class MarkerView extends Marker {
-
-  private MarkerViewManager markerViewManager;
-
-  private float width;
-  private float height;
-
-  private float anchorU;
-  private float anchorV;
-
-  private float offsetX = MapboxConstants.UNMEASURED;
-  private float offsetY = MapboxConstants.UNMEASURED;
-
-  private float infoWindowAnchorU;
-  private float infoWindowAnchorV;
-
-  private boolean flat;
-  private boolean visible = true;
-
-  private float tiltValue;
-  private float rotation;
-  private float alpha = 1;
-
-  private Icon markerViewIcon;
-
-  private boolean selected;
-
-
-  /**
-   * Publicly hidden default constructor
-   */
-  MarkerView() {
-  }
-
-  /**
-   * Creates a instance of MarkerView using the builder of MarkerView
-   *
-   * @param baseMarkerViewOptions the builder used to construct the MarkerView
-   */
-  public MarkerView(BaseMarkerViewOptions baseMarkerViewOptions) {
-    super(baseMarkerViewOptions);
-    this.alpha = baseMarkerViewOptions.getAlpha();
-    this.anchorU = baseMarkerViewOptions.getAnchorU();
-    this.anchorV = baseMarkerViewOptions.getAnchorV();
-    this.infoWindowAnchorU = baseMarkerViewOptions.getInfoWindowAnchorU();
-    this.infoWindowAnchorV = baseMarkerViewOptions.getInfoWindowAnchorV();
-    this.flat = baseMarkerViewOptions.isFlat();
-    this.rotation = baseMarkerViewOptions.getRotation();
-    this.selected = baseMarkerViewOptions.selected;
-  }
-
-  float getWidth() {
-    return width;
-  }
-
-  void setWidth(float width) {
-    this.width = width;
-  }
-
-  float getHeight() {
-    return height;
-  }
-
-  void setHeight(float height) {
-    this.height = height;
-  }
-
-  /**
-   * Specifies the anchor being set on a particular point of the MarkerView.
-   * <p>
-   * The anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0], where (0, 0)
-   * is the top-left corner of the image, and (1, 1) is the bottom-right corner.
-   * </p>
-   *
-   * @param u u-coordinate of the anchor, as a ratio of the image width (in the range [0, 1]).
-   * @param v v-coordinate of the anchor, as a ratio of the image height (in the range [0, 1]).
-   */
-  public void setAnchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) {
-    this.anchorU = u;
-    this.anchorV = v;
-    setOffset(-1, -1);
-  }
-
-  /**
-   * Get the horizontal distance, normalized to [0, 1], of the anchor from the left edge.
-   *
-   * @return The u-value of the anchor.
-   */
-  public float getAnchorU() {
-    return anchorU;
-  }
-
-  /**
-   * Get the vertical distance, normalized to [0, 1], of the anchor from the top edge.
-   *
-   * @return the v-value of the anchor.
-   */
-  public float getAnchorV() {
-    return anchorV;
-  }
-
-  /**
-   * Internal method to set the calculated offset.
-   * <p>
-   * These are calculated based on the View bounds and the provided anchor.
-   * </p>
-   *
-   * @param x the x-value of the offset.
-   * @param y the y-value of the offset.
-   */
-  void setOffset(float x, float y) {
-    offsetX = x;
-    offsetY = y;
-  }
-
-  /**
-   * Internal method to get the horizontal calculated offset.
-   *
-   * @return the calculated horizontal offset.
-   */
-  float getOffsetX() {
-    return offsetX;
-  }
-
-  /**
-   * Internal method to get the vertical calculated offset.
-   *
-   * @return the calculated vertical offset.
-   */
-  float getOffsetY() {
-    return offsetY;
-  }
-
-  /**
-   * Specifies the anchor point of the info window on the View of the MarkerView.
-   * <p>
-   * The anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0], where (0, 0)
-   * is the top-left corner of the image, and (1, 1) is the bottom-right corner.
-   * </p>
-   * <p>
-   * The default is the top middle of the View.
-   * </p>
-   *
-   * @param u u-coordinate of the info window anchor, as a ratio of the image width (in the range [0, 1]).
-   * @param v v-coordinate of the info window anchor, as a ratio of the image height (in the range [0, 1]).
-   * @see #setAnchor(float, float) for more details.
-   */
-  public void setInfoWindowAnchor(@FloatRange(from = 0.0, to = 1.0) float u,
-                                  @FloatRange(from = 0.0, to = 1.0) float v) {
-    this.infoWindowAnchorU = u;
-    this.infoWindowAnchorV = v;
-  }
-
-  /**
-   * Get the horizontal distance, normalized to [0, 1], of the info window anchor from the left edge.
-   *
-   * @return the u value of the InfoWindow anchor.
-   */
-  public float getInfoWindowAnchorU() {
-    return infoWindowAnchorU;
-  }
-
-  /**
-   * Get the vertical distance, normalized to [0, 1], of the info window anchor from the top edge.
-   *
-   * @return the v value of the InfoWindow anchor.
-   */
-  public float getInfoWindowAnchorV() {
-    return infoWindowAnchorV;
-  }
-
-  /**
-   * Get the flat state of a MarkerView.
-   *
-   * @return true if the MarkerView is flat; false if the MarkerView is billboard.
-   */
-  public boolean isFlat() {
-    return flat;
-  }
-
-  /**
-   * Sets whether this MarkerView should be flat against the map (true) or a billboard facing the
-   * camera (false).
-   *
-   * @param flat the flat state of the MarkerView.
-   */
-  public void setFlat(boolean flat) {
-    this.flat = flat;
-  }
-
-  /**
-   * Internal method to get the current tilted value of a MarkerView.
-   *
-   * @return the tilted value.
-   */
-  float getTilt() {
-    return tiltValue;
-  }
-
-  /**
-   * Internal method to set the current titled value of a MarkerView.
-   *
-   * @param tiltValue the tilted value to set.
-   */
-  void setTilt(@FloatRange(from = 0.0, to = MapboxConstants.MAXIMUM_TILT) float tiltValue) {
-    this.tiltValue = tiltValue;
-  }
-
-  /**
-   * Set the visible state of a MarkerView.
-   *
-   * @param visible true will make the MarkerView visible, false will hide the MarkerView.
-   */
-  public void setVisible(boolean visible) {
-    this.visible = visible;
-    if (markerViewManager != null) {
-      markerViewManager.animateVisible(this, visible);
-    }
-  }
-
-  /**
-   * Returns the visible state of the MarkerView.
-   *
-   * @return the visible state.
-   */
-  public boolean isVisible() {
-    return visible;
-  }
-
-  /**
-   * Set the rotation value of the MarkerView in degrees.
-   * <p>
-   * Input will be limited to 0 - 360 degrees.
-   * </p>
-   * <p>
-   * This will result in animating the rotation of the MarkerView using an rotation animator
-   * from current value to the provided parameter value.
-   * </p>
-   *
-   * @param rotation the rotation value to animate to.
-   */
-  public void setRotation(float rotation) {
-    this.rotation = rotation;
-    if (markerViewManager != null) {
-      markerViewManager.setRotation(this, rotation);
-    }
-  }
-
-  /**
-   * Get the rotation value of the MarkerView.
-   *
-   * @return the rotation value.
-   */
-  public float getRotation() {
-    return rotation;
-  }
-
-  /**
-   * Get the alpha value of the MarkerView.
-   *
-   * @return the alpha value.
-   */
-  public float getAlpha() {
-    return alpha;
-  }
-
-  /**
-   * Set the alpha value of the MarkerView.
-   * <p>
-   * This will result in animating the alpha of the MarkerView using an alpha animator
-   * from current value to the provided parameter value.
-   * </p>
-   *
-   * @param alpha the alpha value to animate to.
-   */
-  public void setAlpha(@FloatRange(from = 0.0, to = 255.0) float alpha) {
-    this.alpha = alpha;
-    if (markerViewManager != null) {
-      markerViewManager.animateAlpha(this, alpha);
-    }
-  }
-
-  /**
-   * Set the icon of the MarkerView.
-   *
-   * @param icon the {@link Icon} to be used as Marker image.
-   */
-  @Override
-  public void setIcon(@Nullable Icon icon) {
-    if (icon != null) {
-      markerViewIcon = IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID, icon.getBitmap());
-    }
-    Icon transparentIcon = IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID,
-      IconFactory.ICON_MARKERVIEW_BITMAP);
-    if (markerViewManager != null) {
-      markerViewManager.updateIcon(this);
-    }
-    super.setIcon(transparentIcon);
-  }
-
-  /**
-   * Sets the location of the marker.
-   *
-   * @param position A {@link LatLng} defining the marker position.
-   */
-  @Override
-  public void setPosition(LatLng position) {
-    super.setPosition(position);
-    if (markerViewManager != null) {
-      markerViewManager.setWaitingForRenderInvoke(true);
-      markerViewManager.update();
-    }
-  }
-
-  /**
-   * Determine if the {@link MarkerView} is selected or not.
-   *
-   * @return True if the MarkerView's selected, else false.
-   */
-  public boolean isSelected() {
-    return selected;
-  }
-
-  /**
-   * For internal use only, use {@link MapboxMap#selectMarker(Marker)} instead.
-   */
-  void setSelected(boolean selected) {
-    this.selected = selected;
-  }
-
-  /**
-   * Get the icon of the MarkerView.
-   *
-   * @return the icon use as Marker image.
-   */
-  @Override
-  public Icon getIcon() {
-    if (markerViewIcon == null) {
-      setIcon(IconFactory.getInstance(Mapbox.getApplicationContext()).defaultMarkerView());
-    }
-    return markerViewIcon;
-  }
-
-  /**
-   * Set the MapboxMap associated tot the MapView containing the MarkerView.
-   * <p>
-   * This method is used to instantiate the MarkerView and provide an instance of
-   * {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter}
-   * </p>
-   * <p>
-   * This method is used to notify that a MarkerView is no longer active by setting a null value.
-   * </p>
-   *
-   * @param mapboxMap the MapboxMap instances.
-   */
-  @Override
-  public void setMapboxMap(MapboxMap mapboxMap) {
-    super.setMapboxMap(mapboxMap);
-    if (mapboxMap != null) {
-      if (isFlat()) {
-        // initial tilt value if MapboxMap is started with a tilt attribute
-        tiltValue = (float) mapboxMap.getCameraPosition().tilt;
-      }
-
-      markerViewManager = mapboxMap.getMarkerViewManager();
-    }
-  }
-
-  /**
-   * Invalidates the MarkerView resulting in remeasuring the View.
-   */
-  void invalidate() {
-    width = height = 0;
-    offsetX = offsetY = MapboxConstants.UNMEASURED;
-    markerViewManager.invalidateViewMarkersInVisibleRegion();
-  }
-
-  /**
-   * Get the String representation of a MarkerView.
-   *
-   * @return the String representation.
-   */
-  @Override
-  public String toString() {
-    return "MarkerView [position[" + getPosition() + "]]";
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
deleted file mode 100644
index 8304d0e6ed..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ /dev/null
@@ -1,682 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.graphics.RectF;
-import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.ImageView;
-
-import com.mapbox.mapboxsdk.R;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.utils.AnimatorUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Interface for interacting with ViewMarkers objects inside of a MapView.
- * <p>
- * This class is responsible for managing a {@link MarkerView} item.
- * </p>
- * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
- * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
- */
-@Deprecated
-public class MarkerViewManager implements MapView.OnMapChangedListener {
-
-  private final ViewGroup markerViewContainer;
-  private final ViewTreeObserver.OnPreDrawListener markerViewPreDrawObserver =
-    new ViewTreeObserver.OnPreDrawListener() {
-      @Override
-      public boolean onPreDraw() {
-        invalidateViewMarkersInVisibleRegion();
-        markerViewContainer.getViewTreeObserver().removeOnPreDrawListener(markerViewPreDrawObserver);
-        return false;
-      }
-    };
-  private final Map<MarkerView, View> markerViewMap = new HashMap<>();
-  private final LongSparseArray<OnMarkerViewAddedListener> markerViewAddedListenerMap = new LongSparseArray<>();
-  private final List<MapboxMap.MarkerViewAdapter> markerViewAdapters = new ArrayList<>();
-
-  // TODO refactor MapboxMap out for Projection and Transform
-  // Requires removing MapboxMap from Annotations by using Peer model from #6912
-  private MapboxMap mapboxMap;
-
-  private boolean enabled;
-  private long updateTime;
-  private MapboxMap.OnMarkerViewClickListener onMarkerViewClickListener;
-  private boolean isWaitingForRenderInvoke;
-
-  /**
-   * Creates an instance of MarkerViewManager.
-   *
-   * @param container the ViewGroup associated with the MarkerViewManager
-   */
-  public MarkerViewManager(@NonNull ViewGroup container) {
-    this.markerViewContainer = container;
-    this.markerViewAdapters.add(new ImageMarkerViewAdapter(container.getContext()));
-  }
-
-  // TODO refactor MapboxMap out for Projection and Transform
-  // Requires removing MapboxMap from Annotations by using Peer model from #6912
-  public void bind(MapboxMap mapboxMap) {
-    this.mapboxMap = mapboxMap;
-  }
-
-  @Override
-  public void onMapChanged(@MapView.MapChange int change) {
-    if (isWaitingForRenderInvoke && change == MapView.DID_FINISH_RENDERING_FRAME_FULLY_RENDERED) {
-      isWaitingForRenderInvoke = false;
-      invalidateViewMarkersInVisibleRegion();
-    }
-  }
-
-  /**
-   * Called to enable or disable MarkerView management.
-   *
-   * @param enabled true if management should be enabled
-   */
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-  }
-
-  /**
-   * Called with true to wait for the next render invocation.
-   *
-   * @param waitingForRenderInvoke true if waiting for next render event
-   */
-  public void setWaitingForRenderInvoke(boolean waitingForRenderInvoke) {
-    isWaitingForRenderInvoke = waitingForRenderInvoke;
-  }
-
-  /**
-   * Animate a MarkerView to a given rotation.
-   * <p>
-   * The {@link MarkerView} will be rotated from its current rotation to the given rotation.
-   * </p>
-   *
-   * @param marker   the MarkerView to rotate.
-   * @param rotation the rotation value.
-   */
-  public void animateRotation(@NonNull MarkerView marker, float rotation) {
-    View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      AnimatorUtils.rotate(convertView, rotation);
-    }
-  }
-
-  /**
-   * Animate a MarkerView with a given rotation.
-   *
-   * @param marker   the MarkerView to rotate by.
-   * @param rotation the rotation by value, limited to 0 - 360 degrees.
-   */
-  public void animateRotationBy(@NonNull MarkerView marker, float rotation) {
-    View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      convertView.animate().cancel();
-      // calculate new direction
-      float diff = rotation - convertView.getRotation();
-      if (diff > 180.0f) {
-        diff -= 360.0f;
-      } else if (diff < -180.0f) {
-        diff += 360.f;
-      }
-      AnimatorUtils.rotateBy(convertView, diff);
-    }
-  }
-
-  /**
-   * Set the rotation of a MarkerView to a given rotation value.
-   *
-   * @param marker   The MarkerView to change its rotation value
-   * @param rotation The rotation value
-   */
-  public void setRotation(@NonNull MarkerView marker, float rotation) {
-    View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      convertView.animate().cancel();
-      convertView.setRotation(rotation);
-    }
-  }
-
-  /**
-   * Animate a MarkerView to a given alpha value.
-   * <p>
-   * The {@link MarkerView} will be transformed from its current alpha value to the given value.
-   * </p>
-   *
-   * @param marker the MarkerView to change its alpha value.
-   * @param alpha  the alpha value.
-   */
-  public void animateAlpha(@NonNull MarkerView marker, float alpha) {
-    View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      AnimatorUtils.alpha(convertView, alpha);
-    }
-  }
-
-  /**
-   * Animate a MarkerVIew to be visible or invisible
-   * <p>
-   * The {@link MarkerView} will be made {@link View#VISIBLE} or {@link View#GONE}.
-   * </p>
-   *
-   * @param marker  the MarkerView to change its visibility
-   * @param visible the flag indicating if MarkerView is visible
-   */
-  public void animateVisible(@NonNull MarkerView marker, boolean visible) {
-    View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      convertView.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-  }
-
-  /**
-   * Updates the position of MarkerViews currently found in the viewport.
-   * <p>
-   * The collection of {@link MarkerView} will be iterated and each item position will be updated.
-   * If an item is View state is not visible and its related flag is set to visible, the
-   * {@link MarkerView} will be animated to visible using alpha animation.
-   * </p>
-   */
-  public void updateMarkerViewsPosition() {
-    for (final MarkerView marker : markerViewMap.keySet()) {
-      final View convertView = markerViewMap.get(marker);
-      if (convertView != null) {
-        PointF point = mapboxMap.getProjection().toScreenLocation(marker.getPosition());
-        if (marker.getOffsetX() == MapboxConstants.UNMEASURED) {
-          // ensure view is measured first
-          // #6805 invalidate marker views to ensure convertView width and height
-          // values are properly measured and up to date
-          if (marker.getWidth() == 0 && marker.isVisible()) {
-            convertView.getViewTreeObserver().addOnPreDrawListener(markerViewPreDrawObserver);
-          }
-        }
-
-        marker.setWidth(convertView.getWidth());
-        marker.setHeight(convertView.getHeight());
-
-        if (marker.getWidth() != 0) {
-          int x = (int) (marker.getAnchorU() * marker.getWidth());
-          int y = (int) (marker.getAnchorV() * marker.getHeight());
-          marker.setOffset(x, y);
-        }
-
-        convertView.setX(point.x - marker.getOffsetX());
-        convertView.setY(point.y - marker.getOffsetY());
-
-        // animate visibility
-        if (marker.isVisible() && convertView.getVisibility() == View.GONE) {
-          animateVisible(marker, true);
-        }
-      }
-    }
-  }
-
-  /**
-   * Set tilt on every non flat MarkerView currently shown in the Viewport.
-   *
-   * @param tilt the tilt value.
-   */
-  public void setTilt(float tilt) {
-    View convertView;
-    for (MarkerView markerView : markerViewMap.keySet()) {
-      if (markerView.isFlat()) {
-        convertView = markerViewMap.get(markerView);
-        if (convertView != null) {
-          markerView.setTilt(tilt);
-          convertView.setRotationX(tilt);
-        }
-      }
-    }
-  }
-
-  /**
-   * Update and invalidate the MarkerView icon.
-   *
-   * @param markerView the marker view to updates.
-   */
-  public void updateIcon(@NonNull MarkerView markerView) {
-    View convertView = markerViewMap.get(markerView);
-    if (convertView != null && convertView instanceof ImageView) {
-      ((ImageView) convertView).setImageBitmap(markerView.getIcon().getBitmap());
-      markerView.invalidate();
-    }
-  }
-
-  /**
-   * Animate a MarkerView to a deselected state.
-   * <p>
-   * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onDeselect(MarkerView, View)}
-   * will be called to execute an animation.
-   * </p>
-   *
-   * @param marker the MarkerView to deselect.
-   */
-  public void deselect(@NonNull MarkerView marker) {
-    deselect(marker, true);
-  }
-
-  /**
-   * Animate a MarkerView to a deselected state.
-   * <p>
-   * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onDeselect(MarkerView, View)}
-   * will be called to execute an animation.
-   * </p>
-   *
-   * @param marker        the MarkerView to deselect.
-   * @param callbackToMap indicates if deselect marker must be called on MapboxMap.
-   */
-  public void deselect(@NonNull MarkerView marker, boolean callbackToMap) {
-    final View convertView = markerViewMap.get(marker);
-    if (convertView != null) {
-      for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) {
-        if (adapter.getMarkerClass().equals(marker.getClass())) {
-          adapter.onDeselect(marker, convertView);
-        }
-      }
-    }
-    if (callbackToMap) {
-      mapboxMap.deselectMarker(marker);
-    }
-    marker.setSelected(false);
-  }
-
-  /**
-   * Animate a MarkerView to a selected state.
-   *
-   * @param marker the MarkerView object to select.
-   */
-  public void select(@NonNull MarkerView marker) {
-    select(marker, true);
-  }
-
-  /**
-   * Animate a MarkerView to a selected state.
-   *
-   * @param marker        the MarkerView object to select.
-   * @param callbackToMap indicates if select marker must be called on {@link MapboxMap}.
-   */
-  public void select(@NonNull MarkerView marker, boolean callbackToMap) {
-    final View convertView = markerViewMap.get(marker);
-    for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) {
-      if (adapter.getMarkerClass().equals(marker.getClass())) {
-        select(marker, convertView, adapter, callbackToMap);
-      }
-    }
-  }
-
-  /**
-   * Animate a MarkerView to a selected state.
-   * <p>
-   * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onSelect(MarkerView, View, boolean)}
-   * will be called to execute an animation.
-   * </p>
-   *
-   * @param marker      the MarkerView object to select.
-   * @param convertView the View presentation of the MarkerView.
-   * @param adapter     the adapter used to adapt the marker to the convertView.
-   */
-  public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter) {
-    select(marker, convertView, adapter, true);
-  }
-
-
-  /**
-   * Animate a MarkerView to a selected state.
-   * <p>
-   * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onSelect(MarkerView, View, boolean)}
-   * will be called to execute an animation.
-   * </p>
-   *
-   * @param marker        the MarkerView object to select.
-   * @param convertView   the View presentation of the MarkerView.
-   * @param adapter       the adapter used to adapt the marker to the convertView.
-   * @param callbackToMap indicates if select marker must be called on MapboxMap.
-   */
-  public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter,
-                     boolean callbackToMap) {
-    if (convertView != null) {
-      if (adapter.onSelect(marker, convertView, false)) {
-        if (callbackToMap) {
-          mapboxMap.selectMarker(marker);
-        }
-      }
-      marker.setSelected(true);
-      convertView.bringToFront();
-    }
-  }
-
-  /**
-   * Get view representation from a MarkerView. If marker is not found in current viewport,
-   * {@code null} is returned.
-   *
-   * @param marker the marker to get the view.
-   * @return the Android SDK View object.
-   */
-  @Nullable
-  public View getView(MarkerView marker) {
-    return markerViewMap.get(marker);
-  }
-
-  /**
-   * Get the view adapter for a marker.
-   *
-   * @param markerView the marker to get the view adapter.
-   * @return the MarkerView adapter.
-   */
-  @Nullable
-  public MapboxMap.MarkerViewAdapter getViewAdapter(MarkerView markerView) {
-    MapboxMap.MarkerViewAdapter adapter = null;
-    for (MapboxMap.MarkerViewAdapter a : markerViewAdapters) {
-      if (a.getMarkerClass().equals(markerView.getClass())) {
-        adapter = a;
-      }
-    }
-    return adapter;
-  }
-
-  /**
-   * Remove a MarkerView from a map.
-   * <p>
-   * The {@link MarkerView} will be removed using an alpha animation and related {@link View}
-   * will be released to the android.support.v4.util.Pools.SimplePool from the related
-   * {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter}. It's possible to remove
-   * the {@link MarkerView} from the underlying collection if needed.
-   * </p>
-   *
-   * @param marker the MarkerView to remove.
-   */
-  public void removeMarkerView(MarkerView marker) {
-    final View viewHolder = markerViewMap.get(marker);
-    if (viewHolder != null && marker != null) {
-      for (final MapboxMap.MarkerViewAdapter<?> adapter : markerViewAdapters) {
-        if (adapter.getMarkerClass().equals(marker.getClass())) {
-          if (adapter.prepareViewForReuse(marker, viewHolder)) {
-            // reset offset for reuse
-            marker.setOffset(MapboxConstants.UNMEASURED, MapboxConstants.UNMEASURED);
-            adapter.releaseView(viewHolder);
-          }
-        }
-      }
-    }
-    marker.setMapboxMap(null);
-    markerViewMap.remove(marker);
-  }
-
-  /**
-   * Add a MarkerViewAdapter to the MarkerViewManager.
-   * <p>
-   * The provided MarkerViewAdapter must supply a generic subclass of MarkerView.
-   * </p>
-   *
-   * @param markerViewAdapter the MarkerViewAdapter to add.
-   */
-  public void addMarkerViewAdapter(MapboxMap.MarkerViewAdapter markerViewAdapter) {
-    if (markerViewAdapter.getMarkerClass().equals(MarkerView.class)) {
-      throw new RuntimeException("Providing a custom MarkerViewAdapter requires subclassing MarkerView");
-    }
-
-    if (!markerViewAdapters.contains(markerViewAdapter)) {
-      markerViewAdapters.add(markerViewAdapter);
-      invalidateViewMarkersInVisibleRegion();
-    }
-  }
-
-  /**
-   * Get all MarkerViewAdapters associated with this MarkerViewManager.
-   *
-   * @return a List of MarkerViewAdapters.
-   */
-  public List<MapboxMap.MarkerViewAdapter> getMarkerViewAdapters() {
-    return markerViewAdapters;
-  }
-
-  /**
-   * Register a callback to be invoked when this view is clicked.
-   *
-   * @param listener the callback to be invoked.
-   */
-  public void setOnMarkerViewClickListener(@Nullable MapboxMap.OnMarkerViewClickListener listener) {
-    onMarkerViewClickListener = listener;
-  }
-
-  /**
-   * Schedule that ViewMarkers found in the viewport are invalidated.
-   * <p>
-   * This method is rate limited, and {@link #invalidateViewMarkersInVisibleRegion} will only be called
-   * once each 250 ms.
-   * </p>
-   */
-  public void update() {
-    if (enabled) {
-      long currentTime = SystemClock.elapsedRealtime();
-      if (currentTime < updateTime) {
-        updateMarkerViewsPosition();
-        return;
-      }
-      invalidateViewMarkersInVisibleRegion();
-      updateTime = currentTime + 250;
-    }
-  }
-
-  /**
-   * Invalidate the ViewMarkers found in the viewport.
-   * <p>
-   * This method will remove any markers that aren't in the viewport anymore and will add new
-   * ones for each found Marker in the changed viewport.
-   * </p>
-   */
-  public void invalidateViewMarkersInVisibleRegion() {
-    RectF mapViewRect = new RectF(0, 0, markerViewContainer.getWidth(), markerViewContainer.getHeight());
-    List<MarkerView> markers = mapboxMap.getMarkerViewsInRect(mapViewRect);
-    View convertView;
-
-    // remove old markers
-    Iterator<MarkerView> iterator = markerViewMap.keySet().iterator();
-    while (iterator.hasNext()) {
-      MarkerView marker = iterator.next();
-      if (!markers.contains(marker)) {
-        // remove marker
-        convertView = markerViewMap.get(marker);
-        for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) {
-          if (adapter.getMarkerClass().equals(marker.getClass())) {
-            adapter.prepareViewForReuse(marker, convertView);
-            adapter.releaseView(convertView);
-            iterator.remove();
-          }
-        }
-      }
-    }
-
-    // introduce new markers
-    for (final MarkerView marker : markers) {
-      if (!markerViewMap.containsKey(marker)) {
-        for (final MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) {
-          if (adapter.getMarkerClass().equals(marker.getClass())) {
-
-            // Inflate View
-            convertView = (View) adapter.getViewReusePool().acquire();
-            final View adaptedView = adapter.getView(marker, convertView, markerViewContainer);
-            if (adaptedView != null) {
-              adaptedView.setRotationX(marker.getTilt());
-              adaptedView.setRotation(marker.getRotation());
-              adaptedView.setAlpha(marker.getAlpha());
-              adaptedView.setVisibility(View.GONE);
-
-              if (mapboxMap.getSelectedMarkers().contains(marker)) {
-                // if a marker to be shown was selected
-                // replay that animation with duration 0
-                if (adapter.onSelect(marker, adaptedView, true)) {
-                  mapboxMap.selectMarker(marker);
-                }
-              }
-
-              marker.setMapboxMap(mapboxMap);
-              markerViewMap.put(marker, adaptedView);
-              if (convertView == null) {
-                adaptedView.setVisibility(View.GONE);
-                markerViewContainer.addView(adaptedView);
-              }
-            }
-
-            // notify listener is marker view is rendered
-            OnMarkerViewAddedListener onViewAddedListener = markerViewAddedListenerMap.get(marker.getId());
-            if (onViewAddedListener != null) {
-              onViewAddedListener.onViewAdded(marker);
-              markerViewAddedListenerMap.remove(marker.getId());
-            }
-          }
-        }
-      }
-    }
-
-    // clear map, don't keep references to MarkerView listeners that are not found in the bounds of the map.
-    markerViewAddedListenerMap.clear();
-
-    // trigger update to make newly added ViewMarker visible,
-    // these would only be updated when the map is moved.
-    updateMarkerViewsPosition();
-  }
-
-  /**
-   * When the provided MarkerView is clicked on by a user, we check if a custom click
-   * event has been created and if not, display a InfoWindow.
-   *
-   * @param markerView that the click event occurred
-   * @return true if the marker view click has been handled, false if not
-   */
-  public boolean onClickMarkerView(MarkerView markerView) {
-    boolean clickHandled = false;
-
-    MapboxMap.MarkerViewAdapter adapter = getViewAdapter(markerView);
-    View view = getView(markerView);
-    if (adapter == null || view == null) {
-      // not a valid state
-      return true;
-    }
-
-    if (onMarkerViewClickListener != null) {
-      clickHandled = onMarkerViewClickListener.onMarkerClick(markerView, view, adapter);
-    }
-
-    return clickHandled;
-  }
-
-  /**
-   * Handles the MarkerView info window offset.
-   *
-   * @param marker that we are ensuring info window offset
-   */
-  public void ensureInfoWindowOffset(MarkerView marker) {
-    View view = null;
-    if (markerViewMap.containsKey(marker)) {
-      view = markerViewMap.get(marker);
-    } else {
-      for (final MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) {
-        if (adapter.getMarkerClass().equals(marker.getClass())) {
-          View convertView = (View) adapter.getViewReusePool().acquire();
-          view = adapter.getView(marker, convertView, markerViewContainer);
-          break;
-        }
-      }
-    }
-
-    if (view != null) {
-      if (marker.getWidth() == 0) {
-        if (view.getMeasuredWidth() == 0) {
-          // Ensure the marker's view is measured first
-          view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-        }
-        marker.setWidth(view.getMeasuredWidth());
-        marker.setHeight(view.getMeasuredHeight());
-      }
-
-      // update position on map
-      if (marker.getOffsetX() == MapboxConstants.UNMEASURED) {
-        int x = (int) (marker.getAnchorU() * marker.getWidth());
-        int y = (int) (marker.getAnchorV() * marker.getHeight());
-        marker.setOffset(x, y);
-      }
-
-      // InfoWindow offset
-      int infoWindowOffsetX = (int) ((view.getMeasuredWidth() * marker.getInfoWindowAnchorU()) - marker.getOffsetX());
-      int infoWindowOffsetY = (int) ((view.getMeasuredHeight() * marker.getInfoWindowAnchorV()) - marker.getOffsetY());
-      marker.setTopOffsetPixels(infoWindowOffsetY);
-      marker.setRightOffsetPixels(infoWindowOffsetX);
-    }
-  }
-
-  public ViewGroup getMarkerViewContainer() {
-    return markerViewContainer;
-  }
-
-  public void addOnMarkerViewAddedListener(MarkerView markerView, OnMarkerViewAddedListener onMarkerViewAddedListener) {
-    markerViewAddedListenerMap.put(markerView.getId(), onMarkerViewAddedListener);
-  }
-
-  /**
-   * Default MarkerViewAdapter used for base class of MarkerView to adapt a MarkerView to
-   * an ImageView.
-   */
-  private static class ImageMarkerViewAdapter extends MapboxMap.MarkerViewAdapter<MarkerView> {
-
-    private LayoutInflater inflater;
-
-    ImageMarkerViewAdapter(Context context) {
-      super(context);
-      inflater = LayoutInflater.from(context);
-    }
-
-    @Nullable
-    @Override
-    public View getView(@NonNull MarkerView marker, @Nullable View convertView, @NonNull ViewGroup parent) {
-      ViewHolder viewHolder;
-      if (convertView == null) {
-        viewHolder = new ViewHolder();
-        convertView = inflater.inflate(R.layout.mapbox_view_image_marker, parent, false);
-        viewHolder.imageView = (ImageView) convertView.findViewById(R.id.image);
-        convertView.setTag(viewHolder);
-      } else {
-        viewHolder = (ViewHolder) convertView.getTag();
-      }
-      viewHolder.imageView.setImageBitmap(marker.getIcon().getBitmap());
-      viewHolder.imageView.setContentDescription(marker.getTitle());
-      return convertView;
-    }
-
-    private static class ViewHolder {
-      ImageView imageView;
-    }
-  }
-
-  /**
-   * Interface definition invoked when the View of a MarkerView has been added to the map.
-   * <p>
-   * {@link MapboxMap#addMarker(BaseMarkerOptions)}
-   * and only when the related MarkerView is found in the viewport of the map.
-   * </p>
-   */
-  public interface OnMarkerViewAddedListener {
-
-    /**
-     * Invoked when the View of a MarkerView has been added to the Map.
-     *
-     * @param markerView The MarkerView the View was added for
-     */
-    void onViewAdded(@NonNull MarkerView markerView);
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java
deleted file mode 100644
index 79c72e5f70..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-/**
- * builder class for composing MarkerView objects.
- * <p>
- * Do not extend this class directly but extend {@link BaseMarkerViewOptions} instead.
- * </p>
- * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
- * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
- */
-@Deprecated
-public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerViewOptions> {
-
-  private MarkerView marker;
-
-  /**
-   * Defines default options for a MarkerView. Extend {@link BaseMarkerViewOptions} if you need
-   * more customization.
-   */
-  public MarkerViewOptions() {
-    marker = new MarkerView();
-  }
-
-  protected MarkerViewOptions(Parcel in) {
-    marker = new MarkerView();
-    position((LatLng) in.readParcelable(LatLng.class.getClassLoader()));
-    snippet(in.readString());
-    title(in.readString());
-    flat(in.readByte() != 0);
-    anchor(in.readFloat(), in.readFloat());
-    infoWindowAnchor(in.readFloat(), in.readFloat());
-    rotation(in.readFloat());
-    visible(in.readByte() != 0);
-    alpha(in.readFloat());
-    if (in.readByte() != 0) {
-      // this means we have an icon
-      String iconId = in.readString();
-      Bitmap iconBitmap = in.readParcelable(Bitmap.class.getClassLoader());
-      Icon icon = new Icon(iconId, iconBitmap);
-      icon(icon);
-    }
-  }
-
-  /**
-   * Get the instance of the object for which this method was called.
-   *
-   * @return the object for which this method was called.
-   */
-  @Override
-  public MarkerViewOptions getThis() {
-    return this;
-  }
-
-  /**
-   * Describe the kinds of special objects contained in this Parcelable's
-   * marshalled representation.
-   *
-   * @return integer 0.
-   */
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  /**
-   * Flatten this object in to a Parcel.
-   *
-   * @param out   The Parcel in which the object should be written.
-   * @param flags Additional flags about how the object should be written. May be 0 or
-   *              {@link #PARCELABLE_WRITE_RETURN_VALUE}.
-   */
-  @Override
-  public void writeToParcel(Parcel out, int flags) {
-    out.writeParcelable(getPosition(), flags);
-    out.writeString(getSnippet());
-    out.writeString(getTitle());
-    out.writeByte((byte) (isFlat() ? 1 : 0));
-    out.writeFloat(getAnchorU());
-    out.writeFloat(getAnchorV());
-    out.writeFloat(getInfoWindowAnchorU());
-    out.writeFloat(getInfoWindowAnchorV());
-    out.writeFloat(getRotation());
-    out.writeByte((byte) (isVisible() ? 1 : 0));
-    out.writeFloat(alpha);
-    Icon icon = getIcon();
-    out.writeByte((byte) (icon != null ? 1 : 0));
-    if (icon != null) {
-      out.writeString(getIcon().getId());
-      out.writeParcelable(getIcon().getBitmap(), flags);
-    }
-  }
-
-  /**
-   * Get the {@link MarkerView}.
-   *
-   * @return {@link MarkerView}.
-   */
-  @Override
-  public MarkerView getMarker() {
-    if (position == null) {
-      throw new InvalidMarkerPositionException();
-    }
-
-    marker.setPosition(position);
-    marker.setSnippet(snippet);
-    marker.setTitle(title);
-    marker.setIcon(icon);
-    marker.setFlat(flat);
-    marker.setAnchor(anchorU, anchorV);
-    marker.setInfoWindowAnchor(infoWindowAnchorU, infoWindowAnchorV);
-    marker.setRotation(rotation);
-    marker.setVisible(visible);
-    marker.setAlpha(alpha);
-    return marker;
-  }
-
-  public static final Parcelable.Creator<MarkerViewOptions> CREATOR =
-    new Parcelable.Creator<MarkerViewOptions>() {
-      public MarkerViewOptions createFromParcel(Parcel in) {
-        return new MarkerViewOptions(in);
-      }
-
-      public MarkerViewOptions[] newArray(int size) {
-        return new MarkerViewOptions[size];
-      }
-    };
-
-  /**
-   * Compares this {@link MarkerViewOptions} object with another {@link MarkerViewOptions} and
-   * determines if they match.
-   *
-   * @param object Another {@link MarkerViewOptions} to compare with this object.
-   * @return True if the {@link MarkerViewOptions} being passed in matches this
-   * {@link PolylineOptions} object. Else, false.
-   */
-  @Override
-  public boolean equals(Object object) {
-    if (this == object) {
-      return true;
-    }
-    if (object == null || getClass() != object.getClass()) {
-      return false;
-    }
-    MarkerViewOptions that = (MarkerViewOptions) object;
-    return marker != null ? marker.equals(that.marker) : that.marker == null;
-  }
-
-  /**
-   * Gives an integer which can be used as the bucket number for storing elements of the set/map.
-   * This bucket number is the address of the element inside the set/map. There's no guarantee
-   * that this hash value will be consistent between different Java implementations, or even
-   * between different execution runs of the same program.
-   *
-   * @return integer value you can use for storing element.
-   */
-  @Override
-  public int hashCode() {
-    return marker != null ? marker.hashCode() : 0;
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java
deleted file mode 100644
index c042b00577..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mapbox.mapboxsdk.constants;
-
-import android.support.annotation.IntDef;
-
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * MyBearingTracking exposes different types of bearing tracking modes.
- * <p>
- * These modes visualise the user direction by extracting the direction from either sensor or location data.
- * </p>
- * <p>
- * Required to enable showing the user location first through {@link MapboxMap#setMyLocationEnabled(boolean)}.
- * </p>
- *
- * @see com.mapbox.mapboxsdk.maps.TrackingSettings#setMyBearingTrackingMode(int)
- * @see MyLocationView#setMyBearingTrackingMode(int)
- */
-public class MyBearingTracking {
-
-  @IntDef( {NONE, COMPASS, GPS, GPS_NORTH_FACING})
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface Mode {
-  }
-
-  /**
-   * Bearing tracking is disabled
-   */
-  public static final int NONE = 0x00000000;
-
-  /**
-   * Tracking the bearing of the user based on sensor data
-   */
-  public static final int COMPASS = 0x00000004;
-
-  /**
-   * Tracking the bearing of the user based on GPS data
-   */
-  public static final int GPS = 0x00000008;
-
-  /**
-   * Tracking the bearing of the user based on GPS data, but camera always faces north direction
-   */
-  public static final int GPS_NORTH_FACING = 0x0000000B;
-
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java
deleted file mode 100644
index 1283283fa5..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mapbox.mapboxsdk.constants;
-
-import android.support.annotation.IntDef;
-
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * MyLocationTracking exposes types of location tracking modes.
- * * <p>
- * This allows tracking the user location on screen by updating the camera position when a location update occurs.
- * </p>
- * <p>
- * Required to enable showing the user location first through {@link MapboxMap#setMyLocationEnabled(boolean)}.
- * </p>
- *
- * @see MapboxMap#setMyLocationEnabled(boolean)
- * @see TrackingSettings#setMyLocationTrackingMode(int)
- */
-public class MyLocationTracking {
-
-  @IntDef( {TRACKING_NONE, TRACKING_FOLLOW})
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface Mode {
-  }
-
-  /**
-   * Tracking the location of the user is disabled.
-   */
-  public static final int TRACKING_NONE = 0x00000000;
-
-  /**
-   * Tracking the location of the user. {@link MapView} will reposition to center of {@link MyLocationView}
-   */
-  public static final int TRACKING_FOLLOW = 0x00000004;
-
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index 64b33ad598..9fa7df0dbd 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -2,21 +2,16 @@ package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.Bitmap;
 import android.graphics.PointF;
-import android.graphics.Rect;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 import com.mapbox.mapboxsdk.annotations.Polygon;
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.annotations.Polyline;
@@ -31,7 +26,7 @@ import timber.log.Timber;
  * Responsible for managing and tracking state of Annotations linked to Map. All events related to
  * annotations that occur on {@link MapboxMap} are forwarded to this class.
  * <p>
- * Responsible for referencing {@link InfoWindowManager} and {@link MarkerViewManager}.
+ * Responsible for referencing {@link InfoWindowManager}.
  * </p>
  * <p>
  * Exposes convenience methods to add/remove/update all subtypes of annotations found in
@@ -45,7 +40,6 @@ class AnnotationManager {
   private final MapView mapView;
   private final IconManager iconManager;
   private final InfoWindowManager infoWindowManager = new InfoWindowManager();
-  private final MarkerViewManager markerViewManager;
   private final LongSparseArray<Annotation> annotationsArray;
   private final List<Marker> selectedMarkers = new ArrayList<>();
 
@@ -60,34 +54,27 @@ class AnnotationManager {
   private Polygons polygons;
   private Polylines polylines;
 
-  AnnotationManager(NativeMapView view, MapView mapView, LongSparseArray<Annotation> annotationsArray,
-                    MarkerViewManager markerViewManager, IconManager iconManager, Annotations annotations,
-                    Markers markers, Polygons polygons, Polylines polylines, ShapeAnnotations shapeAnnotations) {
+  AnnotationManager(MapView mapView, LongSparseArray<Annotation> annotationsArray, IconManager iconManager,
+                    Annotations annotations, Markers markers, Polygons polygons, Polylines polylines,
+                    ShapeAnnotations shapeAnnotations) {
     this.mapView = mapView;
     this.annotationsArray = annotationsArray;
-    this.markerViewManager = markerViewManager;
     this.iconManager = iconManager;
     this.annotations = annotations;
     this.markers = markers;
     this.polygons = polygons;
     this.polylines = polylines;
     this.shapeAnnotations = shapeAnnotations;
-    if (view != null) {
-      // null checking needed for unit tests
-      view.addOnMapChangedListener(markerViewManager);
-    }
   }
 
   // TODO refactor MapboxMap out for Projection and Transform
   // Requires removing MapboxMap from Annotations by using Peer model from #6912
   AnnotationManager bind(MapboxMap mapboxMap) {
     this.mapboxMap = mapboxMap;
-    this.markerViewManager.bind(mapboxMap);
     return this;
   }
 
   void update() {
-    markerViewManager.update();
     infoWindowManager.update();
   }
 
@@ -114,13 +101,8 @@ class AnnotationManager {
       if (selectedMarkers.contains(marker)) {
         selectedMarkers.remove(marker);
       }
-
-      if (marker instanceof MarkerView) {
-        markerViewManager.removeMarkerView((MarkerView) marker);
-      } else {
-        // do icon cleanup
-        iconManager.iconCleanup(marker.getIcon());
-      }
+      // do icon cleanup
+      iconManager.iconCleanup(marker.getIcon());
     }
     annotations.removeBy(annotation);
   }
@@ -133,12 +115,7 @@ class AnnotationManager {
         if (selectedMarkers.contains(marker)) {
           selectedMarkers.remove(marker);
         }
-
-        if (marker instanceof MarkerView) {
-          markerViewManager.removeMarkerView((MarkerView) marker);
-        } else {
-          iconManager.iconCleanup(marker.getIcon());
-        }
+        iconManager.iconCleanup(marker.getIcon());
       }
     }
     annotations.removeBy(annotationList);
@@ -155,11 +132,7 @@ class AnnotationManager {
       if (annotation instanceof Marker) {
         Marker marker = (Marker) annotation;
         marker.hideInfoWindow();
-        if (marker instanceof MarkerView) {
-          markerViewManager.removeMarkerView((MarkerView) marker);
-        } else {
-          iconManager.iconCleanup(marker.getIcon());
-        }
+        iconManager.iconCleanup(marker.getIcon());
       }
     }
     annotations.removeAll();
@@ -194,20 +167,6 @@ class AnnotationManager {
     return markers.obtainAllIn(rectangle);
   }
 
-  MarkerView addMarker(@NonNull BaseMarkerViewOptions markerOptions, @NonNull MapboxMap mapboxMap,
-                       @Nullable MarkerViewManager.OnMarkerViewAddedListener onMarkerViewAddedListener) {
-    return markers.addViewBy(markerOptions, mapboxMap, onMarkerViewAddedListener);
-  }
-
-  List<MarkerView> addMarkerViews(@NonNull List<? extends BaseMarkerViewOptions> markerViewOptions,
-                                  @NonNull MapboxMap mapboxMap) {
-    return markers.addViewsBy(markerViewOptions, mapboxMap);
-  }
-
-  List<MarkerView> getMarkerViewsInRect(@NonNull RectF rectangle) {
-    return markers.obtainViewsIn(rectangle);
-  }
-
   void reloadMarkers() {
     markers.reload();
   }
@@ -283,11 +242,6 @@ class AnnotationManager {
       deselectMarkers();
     }
 
-    if (marker instanceof MarkerView) {
-      markerViewManager.select((MarkerView) marker, false);
-      markerViewManager.ensureInfoWindowOffset((MarkerView) marker);
-    }
-
     if (infoWindowManager.isInfoWindowValidForMarker(marker) || infoWindowManager.getInfoWindowAdapter() != null) {
       infoWindowManager.add(marker.showInfoWindow(mapboxMap, mapView));
     }
@@ -306,10 +260,6 @@ class AnnotationManager {
         if (marker.isInfoWindowShown()) {
           marker.hideInfoWindow();
         }
-
-        if (marker instanceof MarkerView) {
-          markerViewManager.deselect((MarkerView) marker, false);
-        }
       }
     }
 
@@ -326,10 +276,6 @@ class AnnotationManager {
       marker.hideInfoWindow();
     }
 
-    if (marker instanceof MarkerView) {
-      markerViewManager.deselect((MarkerView) marker, false);
-    }
-
     selectedMarkers.remove(marker);
   }
 
@@ -341,10 +287,6 @@ class AnnotationManager {
     return infoWindowManager;
   }
 
-  MarkerViewManager getMarkerViewManager() {
-    return markerViewManager;
-  }
-
   void adjustTopOffsetPixels(MapboxMap mapboxMap) {
     int count = annotationsArray.size();
     for (int i = 0; i < count; i++) {
@@ -424,13 +366,8 @@ class AnnotationManager {
   }
 
   private boolean isClickHandledForMarker(long markerId) {
-    boolean handledDefaultClick;
     Marker marker = (Marker) getAnnotation(markerId);
-    if (marker instanceof MarkerView) {
-      handledDefaultClick = markerViewManager.onClickMarkerView((MarkerView) marker);
-    } else {
-      handledDefaultClick = onClickMarker(marker);
-    }
+    boolean handledDefaultClick = onClickMarker(marker);
 
     if (!handledDefaultClick) {
       toggleMarkerSelectionState(marker);
@@ -470,21 +407,17 @@ class AnnotationManager {
 
   private static class MarkerHitResolver {
 
-    private final MarkerViewManager markerViewManager;
     private final Projection projection;
 
-    private View view;
     private Bitmap bitmap;
     private PointF markerLocation;
 
-    private Rect hitRectView = new Rect();
     private RectF hitRectMarker = new RectF();
     private RectF highestSurfaceIntersection = new RectF();
 
     private long closestMarkerId = NO_ANNOTATION_ID;
 
     MarkerHitResolver(@NonNull MapboxMap mapboxMap) {
-      this.markerViewManager = mapboxMap.getMarkerViewManager();
       this.projection = mapboxMap.getProjection();
     }
 
@@ -495,20 +428,7 @@ class AnnotationManager {
 
     private void resolveForMarkers(MarkerHit markerHit) {
       for (Marker marker : markerHit.markers) {
-        if (marker instanceof MarkerView) {
-          resolveForMarkerView(markerHit, (MarkerView) marker);
-        } else {
-          resolveForMarker(markerHit, marker);
-        }
-      }
-    }
-
-    private void resolveForMarkerView(MarkerHit markerHit, MarkerView markerView) {
-      view = markerViewManager.getView(markerView);
-      if (view != null) {
-        view.getHitRect(hitRectView);
-        hitRectMarker = new RectF(hitRectView);
-        hitTestMarker(markerHit, markerView, hitRectMarker);
+        resolveForMarker(markerHit, marker);
       }
     }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
index 80ffa973e7..ffb9b459c0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
@@ -6,7 +6,6 @@ import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,8 +14,7 @@ import java.util.Map;
 /**
  * Responsible for managing icons added to the Map.
  * <p>
- * Maintains a {@link List} of {@link Icon} and  is responsible for initialising default markers and
- * setting up {@link MarkerView} annotation ghosting.
+ * Maintains a {@link List} of {@link Icon} and  is responsible for initialising default markers.
  * </p>
  * <p>
  * Keep track of icons added and the resulting average icon size. This is used internally by our
@@ -50,13 +48,6 @@ class IconManager {
     return icon;
   }
 
-  void loadIconForMarkerView(MarkerView marker) {
-    Icon icon = marker.getIcon();
-    Bitmap bitmap = icon.getBitmap();
-    updateHighestIconSize(bitmap);
-    addIcon(icon, false);
-  }
-
   int getTopOffsetPixelsForIcon(Icon icon) {
     return (int) (nativeMapView.getTopOffsetPixelsForAnnotationSymbol(icon.getId()) * nativeMapView.getPixelRatio());
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index 8047e19809..6675161390 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -41,7 +41,6 @@ final class MapGestureDetector {
   private final Transform transform;
   private final Projection projection;
   private final UiSettings uiSettings;
-  private final TrackingSettings trackingSettings;
   private final AnnotationManager annotationManager;
   private final CameraChangeDispatcher cameraChangeDispatcher;
 
@@ -89,13 +88,11 @@ final class MapGestureDetector {
   private boolean rotateGestureOccurred;
 
   MapGestureDetector(Context context, Transform transform, Projection projection, UiSettings uiSettings,
-                     TrackingSettings trackingSettings, AnnotationManager annotationManager,
-                     CameraChangeDispatcher cameraChangeDispatcher) {
+                     AnnotationManager annotationManager, CameraChangeDispatcher cameraChangeDispatcher) {
     this.annotationManager = annotationManager;
     this.transform = transform;
     this.projection = projection;
     this.uiSettings = uiSettings;
-    this.trackingSettings = trackingSettings;
     this.cameraChangeDispatcher = cameraChangeDispatcher;
 
     // Touch gesture detectors
@@ -131,10 +128,6 @@ final class MapGestureDetector {
 
   /**
    * Get the current active gesture focal point.
-   * <p>
-   * This could be either the user provided focal point in {@link UiSettings#setFocalPoint(PointF)} or the focal point
-   * defined as a result of {@link TrackingSettings#setMyLocationEnabled(boolean)}.
-   * </p>
    *
    * @return the current active gesture focal point.
    */
@@ -400,7 +393,7 @@ final class MapGestureDetector {
 
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-      if ((!trackingSettings.isScrollGestureCurrentlyEnabled()) || recentScaleGestureOccurred) {
+      if (recentScaleGestureOccurred) {
         // don't allow a fling is scroll is disabled
         // and ignore when a scale gesture has occurred
         return false;
@@ -415,8 +408,6 @@ final class MapGestureDetector {
         return false;
       }
 
-      trackingSettings.resetTrackingModesIfRequired(true, false, false);
-
       // cancel any animation
       transform.cancelTransitions();
 
@@ -441,10 +432,6 @@ final class MapGestureDetector {
     // Called for drags
     @Override
     public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-      if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-        return false;
-      }
-
       if (tiltGestureOccurred) {
         return false;
       }
@@ -467,9 +454,6 @@ final class MapGestureDetector {
         }
       }
 
-      // reset tracking if needed
-      trackingSettings.resetTrackingModesIfRequired(true, false, false);
-
       // Scroll the map
       transform.moveBy(-distanceX, -distanceY, 0 /*no duration*/);
 
@@ -596,10 +580,6 @@ final class MapGestureDetector {
       }
       quickZoom = !twoTap;
 
-      // make an assumption here; if the zoom center is specified by the gesture, it's NOT going
-      // to be in the center of the map. Therefore the zoom will translate the map center, so tracking
-      // should be disabled.
-      trackingSettings.resetTrackingModesIfRequired(!quickZoom, false, false);
       // Scale the map
       if (focalPoint != null) {
         // arround user provided focal point
@@ -711,10 +691,6 @@ final class MapGestureDetector {
     // Called when two fingers first touch the screen
     @Override
     public boolean onRotateBegin(RotateGestureDetector detector) {
-      if (!trackingSettings.isRotateGestureCurrentlyEnabled()) {
-        return false;
-      }
-
       // notify camera change listener
       cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
 
@@ -726,7 +702,7 @@ final class MapGestureDetector {
     // Called for rotation
     @Override
     public boolean onRotate(RotateGestureDetector detector) {
-      if (!trackingSettings.isRotateGestureCurrentlyEnabled() || tiltGestureOccurred) {
+      if (tiltGestureOccurred) {
         return false;
       }
 
@@ -753,10 +729,6 @@ final class MapGestureDetector {
         rotateGestureOccurred = true;
       }
 
-      // rotation constitutes translation of anything except the center of
-      // rotation, so cancel both location and bearing tracking if required
-      trackingSettings.resetTrackingModesIfRequired(true, true, false);
-
       // Calculate map bearing value
       double bearing = transform.getRawBearing() + angle;
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
index d1f01a30f7..1e6c8762a1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
@@ -13,23 +13,19 @@ import android.view.ViewConfiguration;
  * <p>
  * <ul>
  * <li> Uses {@link Transform} to change the map state</li>
- * <li> Uses {@link TrackingSettings} to verify validity of the current tracking mode.</li>
  * <li> Uses {@link UiSettings} to verify validity of user restricted movement.</li>
  * </ul>
  * <p>
  */
 final class MapKeyListener {
 
-  private final TrackingSettings trackingSettings;
   private final Transform transform;
   private final UiSettings uiSettings;
 
   private TrackballLongPressTimeOut currentTrackballLongPressTimeOut;
 
-  MapKeyListener(@NonNull Transform transform, @NonNull TrackingSettings trackingSettings,
-                 @NonNull UiSettings uiSettings) {
+  MapKeyListener(@NonNull Transform transform, @NonNull UiSettings uiSettings) {
     this.transform = transform;
-    this.trackingSettings = trackingSettings;
     this.uiSettings = uiSettings;
   }
 
@@ -55,10 +51,6 @@ final class MapKeyListener {
         return true;
 
       case KeyEvent.KEYCODE_DPAD_LEFT:
-        if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-          return false;
-        }
-
         // Cancel any animation
         transform.cancelTransitions();
 
@@ -67,10 +59,6 @@ final class MapKeyListener {
         return true;
 
       case KeyEvent.KEYCODE_DPAD_RIGHT:
-        if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-          return false;
-        }
-
         // Cancel any animation
         transform.cancelTransitions();
 
@@ -79,10 +67,6 @@ final class MapKeyListener {
         return true;
 
       case KeyEvent.KEYCODE_DPAD_UP:
-        if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-          return false;
-        }
-
         // Cancel any animation
         transform.cancelTransitions();
 
@@ -91,10 +75,6 @@ final class MapKeyListener {
         return true;
 
       case KeyEvent.KEYCODE_DPAD_DOWN:
-        if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-          return false;
-        }
-
         // Cancel any animation
         transform.cancelTransitions();
 
@@ -183,10 +163,6 @@ final class MapKeyListener {
     switch (event.getActionMasked()) {
       // The trackball was rotated
       case MotionEvent.ACTION_MOVE:
-        if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-          return false;
-        }
-
         // Cancel any animation
         transform.cancelTransitions();
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index a921d14038..a8fb320631 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -17,7 +17,6 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.TextureView;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -30,15 +29,12 @@ import com.mapbox.android.telemetry.MapboxTelemetry;
 import com.mapbox.mapboxsdk.BuildConfig;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
 import com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.GLSurfaceViewMapRenderer;
 import com.mapbox.mapboxsdk.maps.renderer.textureview.TextureViewMapRenderer;
 import com.mapbox.mapboxsdk.maps.widgets.CompassView;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
 import com.mapbox.mapboxsdk.storage.FileSource;
 
@@ -82,7 +78,6 @@ public class MapView extends FrameLayout {
   private boolean destroyed;
   private boolean hasSurface;
 
-  private MyLocationView myLocationView;
   private CompassView compassView;
   private PointF focalPoint;
   private ImageView attrView;
@@ -130,7 +125,6 @@ public class MapView extends FrameLayout {
     // inflate view
     View view = LayoutInflater.from(context).inflate(R.layout.mapbox_mapview_internal, this);
     compassView = (CompassView) view.findViewById(R.id.compassView);
-    myLocationView = (MyLocationView) view.findViewById(R.id.userLocationView);
     attrView = (ImageView) view.findViewById(R.id.attributionView);
     logoView = (ImageView) view.findViewById(R.id.logoView);
 
@@ -152,42 +146,33 @@ public class MapView extends FrameLayout {
     // callback for registering touch listeners
     RegisterTouchListener registerTouchListener = new RegisterTouchListener();
 
-    // callback for zooming in the camera
-    CameraZoomInvalidator zoomInvalidator = new CameraZoomInvalidator();
-
     // callback for camera change events
     final CameraChangeDispatcher cameraChangeDispatcher = new CameraChangeDispatcher();
 
     // setup components for MapboxMap creation
     Projection proj = new Projection(nativeMapView);
     UiSettings uiSettings = new UiSettings(proj, focalPointInvalidator, compassView, attrView, logoView);
-    TrackingSettings trackingSettings = new TrackingSettings(myLocationView, uiSettings, focalPointInvalidator,
-      zoomInvalidator);
-    MyLocationViewSettings myLocationViewSettings = new MyLocationViewSettings(myLocationView, proj,
-      focalPointInvalidator);
     LongSparseArray<Annotation> annotationsArray = new LongSparseArray<>();
-    MarkerViewManager markerViewManager = new MarkerViewManager((ViewGroup) findViewById(R.id.markerViewContainer));
     IconManager iconManager = new IconManager(nativeMapView);
     Annotations annotations = new AnnotationContainer(nativeMapView, annotationsArray);
-    Markers markers = new MarkerContainer(nativeMapView, this, annotationsArray, iconManager, markerViewManager);
+    Markers markers = new MarkerContainer(nativeMapView, annotationsArray, iconManager);
     Polygons polygons = new PolygonContainer(nativeMapView, annotationsArray);
     Polylines polylines = new PolylineContainer(nativeMapView, annotationsArray);
     ShapeAnnotations shapeAnnotations = new ShapeAnnotationContainer(nativeMapView, annotationsArray);
-    AnnotationManager annotationManager = new AnnotationManager(nativeMapView, this, annotationsArray,
-      markerViewManager, iconManager, annotations, markers, polygons, polylines, shapeAnnotations);
-    Transform transform = new Transform(nativeMapView, annotationManager.getMarkerViewManager(), trackingSettings,
-      cameraChangeDispatcher);
+    AnnotationManager annotationManager = new AnnotationManager(this, annotationsArray, iconManager,
+      annotations, markers, polygons, polylines, shapeAnnotations);
+    Transform transform = new Transform(nativeMapView, cameraChangeDispatcher);
 
-    mapboxMap = new MapboxMap(nativeMapView, transform, uiSettings, trackingSettings, myLocationViewSettings, proj,
-      registerTouchListener, annotationManager, cameraChangeDispatcher);
+    mapboxMap = new MapboxMap(nativeMapView, transform, uiSettings, proj, registerTouchListener,
+      annotationManager, cameraChangeDispatcher);
     focalPointInvalidator.addListener(mapboxMap.createFocalPointChangeListener());
 
     mapCallback.attachMapboxMap(mapboxMap);
 
     // user input
-    mapGestureDetector = new MapGestureDetector(context, transform, proj, uiSettings, trackingSettings,
-      annotationManager, cameraChangeDispatcher);
-    mapKeyListener = new MapKeyListener(transform, trackingSettings, uiSettings);
+    mapGestureDetector = new MapGestureDetector(context, transform, proj,
+      uiSettings, annotationManager, cameraChangeDispatcher);
+    mapKeyListener = new MapKeyListener(transform, uiSettings);
 
     // overlain zoom buttons
     mapZoomButtonController = new MapZoomButtonController(new ZoomButtonsController(this));
@@ -197,8 +182,6 @@ public class MapView extends FrameLayout {
 
     compassView.injectCompassAnimationListener(createCompassAnimationListener(cameraChangeDispatcher));
     compassView.setOnClickListener(createCompassClickListener(cameraChangeDispatcher));
-    // inject widgets with MapboxMap
-    myLocationView.setMapboxMap(mapboxMap);
     attrView.setOnClickListener(new AttributionClickListener(context, mapboxMap));
 
     // Ensure this view is interactable
@@ -1031,27 +1014,6 @@ public class MapView extends FrameLayout {
     }
   }
 
-  private class CameraZoomInvalidator implements TrackingSettings.CameraZoomInvalidator {
-
-    @Override
-    public void zoomTo(double zoomLevel) {
-      Transform transform = mapboxMap.getTransform();
-      double currentZoomLevel = transform.getCameraPosition().zoom;
-      if (currentZoomLevel < zoomLevel) {
-        setZoom(zoomLevel, mapGestureDetector.getFocalPoint(), transform);
-      }
-    }
-
-    private void setZoom(double zoomLevel, @Nullable PointF focalPoint, @NonNull Transform transform) {
-      if (focalPoint != null) {
-        transform.setZoom(zoomLevel, focalPoint);
-      } else {
-        PointF centerPoint = new PointF(getMeasuredWidth() / 2, getMeasuredHeight() / 2);
-        transform.setZoom(zoomLevel, centerPoint);
-      }
-    }
-  }
-
   private static class MapCallback implements OnMapChangedListener {
 
     private MapboxMap mapboxMap;
@@ -1068,7 +1030,6 @@ public class MapView extends FrameLayout {
         initialLoad = false;
         mapboxMap.onPreMapReady();
         onMapReady();
-        mapboxMap.onPostMapReady();
       } else if (change == DID_FINISH_RENDERING_FRAME || change == DID_FINISH_RENDERING_FRAME_FULLY_RENDERED) {
         mapboxMap.onUpdateFullyRendered();
       } else if (change == REGION_IS_CHANGING || change == REGION_DID_CHANGE || change == DID_FINISH_LOADING_MAP) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 4f2c940ea3..5c171fe43f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -4,27 +4,21 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.location.Location;
 import android.os.Bundle;
 import android.support.annotation.FloatRange;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
-import android.support.v4.util.Pools;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 import com.mapbox.mapboxsdk.annotations.Polygon;
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.annotations.Polyline;
@@ -33,19 +27,14 @@ import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.constants.MyBearingTracking;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.sources.Source;
-import com.mapbox.android.core.location.LocationEngine;
 
-import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;
 import java.util.List;
 
@@ -66,11 +55,9 @@ public final class MapboxMap {
   private final NativeMapView nativeMapView;
 
   private final UiSettings uiSettings;
-  private final TrackingSettings trackingSettings;
   private final Projection projection;
   private final Transform transform;
   private final AnnotationManager annotationManager;
-  private final MyLocationViewSettings myLocationViewSettings;
   private final CameraChangeDispatcher cameraChangeDispatcher;
 
   private final OnRegisterTouchListener onRegisterTouchListener;
@@ -78,14 +65,11 @@ public final class MapboxMap {
   private MapboxMap.OnFpsChangedListener onFpsChangedListener;
   private PointF focalPoint;
 
-  MapboxMap(NativeMapView map, Transform transform, UiSettings ui, TrackingSettings tracking,
-            MyLocationViewSettings myLocationView, Projection projection, OnRegisterTouchListener listener,
+  MapboxMap(NativeMapView map, Transform transform, UiSettings ui, Projection proj, OnRegisterTouchListener listener,
             AnnotationManager annotations, CameraChangeDispatcher cameraChangeDispatcher) {
     this.nativeMapView = map;
     this.uiSettings = ui;
-    this.trackingSettings = tracking;
-    this.projection = projection;
-    this.myLocationViewSettings = myLocationView;
+    this.projection = proj;
     this.annotationManager = annotations.bind(this);
     this.transform = transform;
     this.onRegisterTouchListener = listener;
@@ -95,8 +79,6 @@ public final class MapboxMap {
   void initialise(@NonNull Context context, @NonNull MapboxMapOptions options) {
     transform.initialise(this, options);
     uiSettings.initialise(context, options);
-    myLocationViewSettings.initialise(options);
-    trackingSettings.initialise(options);
 
     // Map configuration
     setDebugActive(options.getDebugActive());
@@ -110,7 +92,6 @@ public final class MapboxMap {
    */
   void onStart() {
     nativeMapView.update();
-    trackingSettings.onStart();
     if (TextUtils.isEmpty(nativeMapView.getStyleUrl())) {
       // if user hasn't loaded a Style yet
       nativeMapView.setStyleUrl(Style.MAPBOX_STREETS);
@@ -121,7 +102,6 @@ public final class MapboxMap {
    * Called when the hosting Activity/Fragment onStop() method is called.
    */
   void onStop() {
-    trackingSettings.onStop();
   }
 
   /**
@@ -133,9 +113,7 @@ public final class MapboxMap {
     outState.putParcelable(MapboxConstants.STATE_CAMERA_POSITION, transform.getCameraPosition());
     outState.putBoolean(MapboxConstants.STATE_DEBUG_ACTIVE, nativeMapView.getDebug());
     outState.putString(MapboxConstants.STATE_STYLE_URL, nativeMapView.getStyleUrl());
-    trackingSettings.onSaveInstanceState(outState);
     uiSettings.onSaveInstanceState(outState);
-    myLocationViewSettings.onSaveInstanceState(outState);
   }
 
   /**
@@ -145,19 +123,11 @@ public final class MapboxMap {
    */
   void onRestoreInstanceState(Bundle savedInstanceState) {
     final CameraPosition cameraPosition = savedInstanceState.getParcelable(MapboxConstants.STATE_CAMERA_POSITION);
-
-    myLocationViewSettings.onRestoreInstanceState(savedInstanceState);
     uiSettings.onRestoreInstanceState(savedInstanceState);
-    trackingSettings.onRestoreInstanceState(savedInstanceState);
-
     if (cameraPosition != null) {
-      moveCamera(CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder(cameraPosition).build())
-      );
+      moveCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder(cameraPosition).build()));
     }
-
     nativeMapView.setDebug(savedInstanceState.getBoolean(MapboxConstants.STATE_DEBUG_ACTIVE));
-
     final String styleUrl = savedInstanceState.getString(MapboxConstants.STATE_STYLE_URL);
     if (!TextUtils.isEmpty(styleUrl)) {
       nativeMapView.setStyleUrl(savedInstanceState.getString(MapboxConstants.STATE_STYLE_URL));
@@ -173,21 +143,9 @@ public final class MapboxMap {
   }
 
   /**
-   * Called when the OnMapReadyCallback has finished executing.
-   * <p>
-   * Invalidation of the camera position is required to update the added components in
-   * OnMapReadyCallback with the correct transformation.
-   * </p>
-   */
-  void onPostMapReady() {
-    invalidateCameraPosition();
-  }
-
-  /**
    * Called when the region is changing or has changed.
    */
   void onUpdateRegionChange() {
-    trackingSettings.update();
     annotationManager.update();
   }
 
@@ -555,38 +513,6 @@ public final class MapboxMap {
   }
 
   //
-  // TrackingSettings
-  //
-
-  /**
-   * Gets the tracking interface settings for the map.
-   *
-   * @return the TrackingSettings asssociated with this map
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public TrackingSettings getTrackingSettings() {
-    return trackingSettings;
-  }
-
-  //
-  // MyLocationViewSettings
-  //
-
-  /**
-   * Gets the settings of the user location for the map.
-   *
-   * @return the MyLocationViewSettings associated with this map
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public MyLocationViewSettings getMyLocationViewSettings() {
-    return myLocationViewSettings;
-  }
-
-  //
   // Projection
   //
 
@@ -804,11 +730,6 @@ public final class MapboxMap {
    * unless specified within {@link CameraUpdate}. A callback can be used to be notified when
    * easing the camera stops. If {@link #getCameraPosition()} is called during the animation, it
    * will return the current location of the camera in flight.
-   * <p>
-   * Note that this will cancel location tracking mode if enabled. You can change this behaviour by calling
-   * {@link com.mapbox.mapboxsdk.maps.TrackingSettings#setDismissLocationTrackingOnGesture(boolean)} with false before
-   * invoking this method and calling it with true in the {@link CancelableCallback#onFinish()}.
-   * </p>
    *
    * @param update             The change that should be applied to the camera.
    * @param durationMs         The duration of the animation in milliseconds. This must be strictly
@@ -830,11 +751,6 @@ public final class MapboxMap {
    * unless specified within {@link CameraUpdate}. A callback can be used to be notified when
    * easing the camera stops. If {@link #getCameraPosition()} is called during the animation, it
    * will return the current location of the camera in flight.
-   * <p>
-   * Note that this will cancel location tracking mode if enabled. You can change this behaviour by calling
-   * {@link com.mapbox.mapboxsdk.maps.TrackingSettings#setDismissLocationTrackingOnGesture(boolean)} with false before
-   * invoking this method and calling it with true in the {@link CancelableCallback#onFinish()}.
-   * </p>
    *
    * @param update             The change that should be applied to the camera.
    * @param durationMs         The duration of the animation in milliseconds. This must be strictly
@@ -927,16 +843,6 @@ public final class MapboxMap {
     transform.animateCamera(MapboxMap.this, update, durationMs, callback);
   }
 
-  /**
-   * Invalidates the current camera position by reconstructing it from mbgl
-   */
-  void invalidateCameraPosition() {
-    CameraPosition cameraPosition = transform.invalidateCameraPosition();
-    if (cameraPosition != null) {
-      transform.updateCameraPosition(cameraPosition);
-    }
-  }
-
   //
   //  Reset North
   //
@@ -1223,77 +1129,6 @@ public final class MapboxMap {
 
   /**
    * <p>
-   * Adds a marker to this map.
-   * </p>
-   * The marker's icon is rendered on the map at the location {@code Marker.position}.
-   * If {@code Marker.title} is defined, the map shows an info box with the marker's title and snippet.
-   *
-   * @param markerOptions A marker options object that defines how to render the marker
-   * @return The {@code Marker} that was added to the map
-   * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
-   * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
-   */
-  @NonNull
-  @Deprecated
-  public MarkerView addMarker(@NonNull BaseMarkerViewOptions markerOptions) {
-    return annotationManager.addMarker(markerOptions, this, null);
-  }
-
-  /**
-   * <p>
-   * Adds a marker to this map.
-   * </p>
-   * The marker's icon is rendered on the map at the location {@code Marker.position}.
-   * If {@code Marker.title} is defined, the map shows an info box with the marker's title and snippet.
-   *
-   * @param markerOptions             A marker options object that defines how to render the marker
-   * @param onMarkerViewAddedListener Callback invoked when the View has been added to the map
-   * @return The {@code Marker} that was added to the map
-   * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
-   * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
-   */
-  @Deprecated
-  @NonNull
-  public MarkerView addMarker(@NonNull BaseMarkerViewOptions markerOptions,
-                              final MarkerViewManager.OnMarkerViewAddedListener onMarkerViewAddedListener) {
-    return annotationManager.addMarker(markerOptions, this, onMarkerViewAddedListener);
-  }
-
-  /**
-   * Adds multiple markersViews to this map.
-   * <p>
-   * The marker's icon is rendered on the map at the location {@code Marker.position}.
-   * If {@code Marker.title} is defined, the map shows an info box with the marker's title and snippet.
-   * </p>
-   *
-   * @param markerViewOptions A list of markerView options objects that defines how to render the markers
-   * @return A list of the {@code MarkerView}s that were added to the map
-   * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
-   * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
-   */
-  @NonNull
-  @Deprecated
-  public List<MarkerView> addMarkerViews(@NonNull List<? extends
-    BaseMarkerViewOptions> markerViewOptions) {
-    return annotationManager.addMarkerViews(markerViewOptions, this);
-  }
-
-  /**
-   * Returns markerViews found inside of a rectangle on this map.
-   *
-   * @param rect the rectangular area on the map to query for markerViews
-   * @return A list of the markerViews that were found in the rectangle
-   * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
-   * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
-   */
-  @NonNull
-  @Deprecated
-  public List<MarkerView> getMarkerViewsInRect(@NonNull RectF rect) {
-    return annotationManager.getMarkerViewsInRect(rect);
-  }
-
-  /**
-   * <p>
    * Adds multiple markers to this map.
    * </p>
    * The marker's icon is rendered on the map at the location {@code Marker.position}.
@@ -1586,15 +1421,6 @@ public final class MapboxMap {
     return annotationManager.getSelectedMarkers();
   }
 
-  /**
-   * Get the MarkerViewManager associated to the MapView.
-   *
-   * @return the associated MarkerViewManager
-   */
-  public MarkerViewManager getMarkerViewManager() {
-    return annotationManager.getMarkerViewManager();
-  }
-
   //
   // InfoWindow
   //
@@ -1670,7 +1496,7 @@ public final class MapboxMap {
     for (int i = 0; i < padding.length; i++) {
       padding[i] = mapPadding[i] + padding[i];
     }
-    projection.setContentPadding(padding, myLocationViewSettings.getPadding());
+    projection.setContentPadding(padding);
 
     // get padded camera position from LatLngBounds
     CameraPosition cameraPosition = nativeMapView.getCameraForLatLngBounds(latLngBounds);
@@ -1694,7 +1520,7 @@ public final class MapboxMap {
     for (int i = 0; i < padding.length; i++) {
       padding[i] = mapPadding[i] + padding[i];
     }
-    projection.setContentPadding(padding, myLocationViewSettings.getPadding());
+    projection.setContentPadding(padding);
 
     // get padded camera position from LatLngBounds
     CameraPosition cameraPosition = nativeMapView.getCameraForGeometry(geometry, bearing);
@@ -1731,7 +1557,7 @@ public final class MapboxMap {
   }
 
   private void setPadding(int[] padding) {
-    projection.setContentPadding(padding, myLocationViewSettings.getPadding());
+    projection.setContentPadding(padding);
     uiSettings.invalidate();
   }
 
@@ -2081,107 +1907,6 @@ public final class MapboxMap {
   }
 
   //
-  // User location
-  //
-
-  /**
-   * Returns the status of the my-location layer.
-   *
-   * @return True if the my-location layer is enabled, false otherwise.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public boolean isMyLocationEnabled() {
-    return trackingSettings.isMyLocationEnabled();
-  }
-
-  /**
-   * <p>
-   * Enables or disables the my-location layer.
-   * While enabled, the my-location layer continuously draws an indication of a user's current
-   * location and bearing.
-   * </p>
-   * In order to use the my-location layer feature you need to request permission for either
-   * android.Manifest.permission#ACCESS_COARSE_LOCATION or android.Manifest.permission#ACCESS_FINE_LOCATION.
-   *
-   * @param enabled True to enable; false to disable.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public void setMyLocationEnabled(boolean enabled) {
-    trackingSettings.setMyLocationEnabled(enabled);
-  }
-
-  /**
-   * Returns the currently displayed user location, or null if there is no location data available.
-   *
-   * @return The currently displayed user location.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Nullable
-  @Deprecated
-  public Location getMyLocation() {
-    return trackingSettings.getMyLocation();
-  }
-
-  /**
-   * Sets a callback that's invoked when the the My Location view
-   * (which signifies the user's location) changes location.
-   *
-   * @param listener The callback that's invoked when the user clicks on a marker.
-   *                 To unset the callback, use null.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public void setOnMyLocationChangeListener(@Nullable MapboxMap.OnMyLocationChangeListener
-                                              listener) {
-    trackingSettings.setOnMyLocationChangeListener(listener);
-  }
-
-  /**
-   * Replaces the location source of the my-location layer.
-   *
-   * @param locationSource A {@link LocationEngine} location source to use in the my-location layer.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public void setLocationSource(@Nullable LocationEngine locationSource) {
-    trackingSettings.setLocationSource(locationSource);
-  }
-
-  /**
-   * Sets a callback that's invoked when the location tracking mode changes.
-   *
-   * @param listener The callback that's invoked when the location tracking mode changes.
-   *                 To unset the callback, use null.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public void setOnMyLocationTrackingModeChangeListener(
-    @Nullable MapboxMap.OnMyLocationTrackingModeChangeListener listener) {
-    trackingSettings.setOnMyLocationTrackingModeChangeListener(listener);
-  }
-
-  /**
-   * Sets a callback that's invoked when the bearing tracking mode changes.
-   *
-   * @param listener The callback that's invoked when the bearing tracking mode changes.
-   *                 To unset the callback, use null.
-   * @deprecated use location layer plugin from
-   * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugin-locationlayer instead.
-   */
-  @Deprecated
-  public void setOnMyBearingTrackingModeChangeListener(@Nullable OnMyBearingTrackingModeChangeListener listener) {
-    trackingSettings.setOnMyBearingTrackingModeChangeListener(listener);
-  }
-
-  //
   // Invalidate
   //
 
@@ -2549,187 +2274,6 @@ public final class MapboxMap {
   }
 
   /**
-   * Interface definition for a callback to be invoked when an MarkerView will be shown.
-   *
-   * @param <U> the instance type of MarkerView
-   * @deprecated Use a {@link com.mapbox.mapboxsdk.style.layers.SymbolLayer} instead. An example of converting Android
-   * SDK views to be used as a symbol see https://github.com/mapbox/mapbox-gl-native/blob/68f32bc104422207c64da8d90e8411b138d87f04/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
-   */
-  @Deprecated
-  public abstract static class MarkerViewAdapter<U extends MarkerView> {
-
-    private Context context;
-    private final Class<U> persistentClass;
-    private final Pools.SimplePool<View> viewReusePool;
-
-    /**
-     * Create an instance of MarkerViewAdapter.
-     *
-     * @param context the context associated to a MapView
-     */
-    @SuppressWarnings("unchecked")
-    public MarkerViewAdapter(Context context) {
-      this.context = context;
-      persistentClass = (Class<U>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
-      viewReusePool = new Pools.SimplePool<>(10000);
-    }
-
-    /**
-     * Called when an MarkerView will be added to the MapView.
-     *
-     * @param marker      the model representing the MarkerView
-     * @param convertView the reusable view
-     * @param parent      the parent ViewGroup of the convertview
-     * @return the View that is adapted to the contents of MarkerView
-     */
-    @Nullable
-    public abstract View getView(@NonNull U marker, @Nullable View convertView, @NonNull ViewGroup parent);
-
-    /**
-     * Called when an MarkerView is removed from the MapView or the View object is going to be reused.
-     * <p>
-     * This method should be used to reset an animated view back to it's original state for view reuse.
-     * </p>
-     * <p>
-     * Returning true indicates you want to the view reuse to be handled automatically.
-     * Returning false indicates you want to perform an animation and you are required calling
-     * {@link #releaseView(View)} yourself.
-     * </p>
-     *
-     * @param marker      the model representing the MarkerView
-     * @param convertView the reusable view
-     * @return true if you want reuse to occur automatically, false if you want to manage this yourself.
-     */
-    public boolean prepareViewForReuse(@NonNull MarkerView marker, @NonNull View convertView) {
-      return true;
-    }
-
-    /**
-     * Called when a MarkerView is selected from the MapView.
-     * <p>
-     * Returning true from this method indicates you want to move the MarkerView to the selected state.
-     * Returning false indicates you want to animate the View first an manually select the MarkerView when appropriate.
-     * </p>
-     *
-     * @param marker                   the model representing the MarkerView
-     * @param convertView              the reusable view
-     * @param reselectionFromRecycling indicates if the onSelect callback is the initial selection
-     *                                 callback or that selection occurs due to recreation of selected marker
-     * @return true if you want to select the Marker immediately, false if you want to manage this yourself.
-     */
-    public boolean onSelect(@NonNull U marker, @NonNull View convertView, boolean reselectionFromRecycling) {
-      return true;
-    }
-
-    /**
-     * Called when a MarkerView is deselected from the MapView.
-     *
-     * @param marker      the model representing the MarkerView
-     * @param convertView the reusable view
-     */
-    public void onDeselect(@NonNull U marker, @NonNull View convertView) {
-    }
-
-    /**
-     * Returns the generic type of the used MarkerView.
-     *
-     * @return the generic type
-     */
-    public final Class<U> getMarkerClass() {
-      return persistentClass;
-    }
-
-    /**
-     * Returns the pool used to store reusable Views.
-     *
-     * @return the pool associated to this adapter
-     */
-    public final Pools.SimplePool<View> getViewReusePool() {
-      return viewReusePool;
-    }
-
-    /**
-     * Returns the context associated to the hosting MapView.
-     *
-     * @return the context used
-     */
-    public final Context getContext() {
-      return context;
-    }
-
-    /**
-     * Release a View to the ViewPool.
-     *
-     * @param view the view to be released
-     */
-    public final void releaseView(View view) {
-      view.setVisibility(View.GONE);
-      viewReusePool.release(view);
-    }
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when the user clicks on a MarkerView.
-   */
-  public interface OnMarkerViewClickListener {
-
-    /**
-     * Called when the user clicks on a MarkerView.
-     *
-     * @param marker  the MarkerView associated to the clicked View
-     * @param view    the clicked View
-     * @param adapter the adapter used to adapt the MarkerView to the View
-     * @return If true the listener has consumed the event and the info window will not be shown
-     */
-    boolean onMarkerClick(@NonNull Marker marker, @NonNull View view, @NonNull MarkerViewAdapter adapter);
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when the the My Location view changes location.
-   *
-   * @see MapboxMap#setOnMyLocationChangeListener(OnMyLocationChangeListener)
-   */
-  public interface OnMyLocationChangeListener {
-    /**
-     * Called when the location of the My Location view has changed
-     * (be it latitude/longitude, bearing or accuracy).
-     *
-     * @param location The current location of the My Location view The type of map change event.
-     */
-    void onMyLocationChange(@Nullable Location location);
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when the the My Location tracking mode changes.
-   *
-   * @see TrackingSettings#setMyLocationTrackingMode(int)
-   */
-  public interface OnMyLocationTrackingModeChangeListener {
-
-    /**
-     * Called when the tracking mode of My Location tracking has changed
-     *
-     * @param myLocationTrackingMode the current active location tracking mode
-     */
-    void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode);
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when the the My Location tracking mode changes.
-   *
-   * @see TrackingSettings#setMyLocationTrackingMode(int)
-   */
-  public interface OnMyBearingTrackingModeChangeListener {
-
-    /**
-     * Called when the tracking mode of My Bearing tracking has changed
-     *
-     * @param myBearingTrackingMode the current active bearing tracking mode
-     */
-    void onMyBearingTrackingModeChange(@MyBearingTracking.Mode int myBearingTrackingMode);
-  }
-
-  /**
    * Interface definition for a callback to be invoked when a task is complete or cancelled.
    */
   public interface CancelableCallback {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
index 2c2f07a112..c00b4ed90d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
@@ -3,17 +3,12 @@ package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
 import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,18 +19,13 @@ import java.util.List;
 class MarkerContainer implements Markers {
 
   private final NativeMapView nativeMapView;
-  private final MapView mapView;
   private final LongSparseArray<Annotation> annotations;
   private final IconManager iconManager;
-  private final MarkerViewManager markerViewManager;
 
-  MarkerContainer(NativeMapView nativeMapView, MapView mapView, LongSparseArray<Annotation> annotations, IconManager
-    iconManager, MarkerViewManager markerViewManager) {
+  MarkerContainer(NativeMapView nativeMapView, LongSparseArray<Annotation> annotations, IconManager iconManager) {
     this.nativeMapView = nativeMapView;
-    this.mapView = mapView;
     this.annotations = annotations;
     this.iconManager = iconManager;
-    this.markerViewManager = markerViewManager;
   }
 
   @Override
@@ -77,7 +67,6 @@ class MarkerContainer implements Markers {
 
   @Override
   public void update(@NonNull Marker updatedMarker, @NonNull MapboxMap mapboxMap) {
-    ensureIconLoaded(updatedMarker, mapboxMap);
     nativeMapView.updateMarker(updatedMarker);
     annotations.setValueAt(annotations.indexOfKey(updatedMarker.getId()), updatedMarker);
   }
@@ -119,76 +108,6 @@ class MarkerContainer implements Markers {
   }
 
   @Override
-  public MarkerView addViewBy(@NonNull BaseMarkerViewOptions markerOptions, @NonNull MapboxMap mapboxMap, @Nullable
-    MarkerViewManager.OnMarkerViewAddedListener onMarkerViewAddedListener) {
-    final MarkerView marker = prepareViewMarker(markerOptions);
-
-    // add marker to map
-    marker.setMapboxMap(mapboxMap);
-    long id = nativeMapView.addMarker(marker);
-    marker.setId(id);
-    annotations.put(id, marker);
-
-    if (onMarkerViewAddedListener != null) {
-      markerViewManager.addOnMarkerViewAddedListener(marker, onMarkerViewAddedListener);
-    }
-    markerViewManager.setEnabled(true);
-    markerViewManager.setWaitingForRenderInvoke(true);
-    return marker;
-  }
-
-  @Override
-  public List<MarkerView> addViewsBy(@NonNull List<? extends BaseMarkerViewOptions> markerViewOptions, @NonNull
-    MapboxMap mapboxMap) {
-    List<MarkerView> markers = new ArrayList<>();
-    for (BaseMarkerViewOptions markerViewOption : markerViewOptions) {
-      // if last marker
-      if (markerViewOptions.indexOf(markerViewOption) == markerViewOptions.size() - 1) {
-        // get notified when render occurs to invalidate and draw MarkerViews
-        markerViewManager.setWaitingForRenderInvoke(true);
-      }
-      // add marker to map
-      MarkerView marker = prepareViewMarker(markerViewOption);
-      marker.setMapboxMap(mapboxMap);
-      long id = nativeMapView.addMarker(marker);
-      marker.setId(id);
-      annotations.put(id, marker);
-      markers.add(marker);
-    }
-    markerViewManager.setEnabled(true);
-    markerViewManager.update();
-    return markers;
-  }
-
-  @Override
-  public List<MarkerView> obtainViewsIn(@NonNull RectF rectangle) {
-    float pixelRatio = nativeMapView.getPixelRatio();
-    RectF rect = new RectF(rectangle.left / pixelRatio,
-      rectangle.top / pixelRatio,
-      rectangle.right / pixelRatio,
-      rectangle.bottom / pixelRatio);
-
-    long[] ids = nativeMapView.queryPointAnnotations(rect);
-
-    List<Long> idsList = new ArrayList<>(ids.length);
-    for (long id : ids) {
-      idsList.add(id);
-    }
-
-    List<MarkerView> annotations = new ArrayList<>(ids.length);
-    List<Annotation> annotationList = obtainAnnotations();
-    int count = annotationList.size();
-    for (int i = 0; i < count; i++) {
-      Annotation annotation = annotationList.get(i);
-      if (annotation instanceof MarkerView && idsList.contains(annotation.getId())) {
-        annotations.add((MarkerView) annotation);
-      }
-    }
-
-    return new ArrayList<>(annotations);
-  }
-
-  @Override
   public void reload() {
     iconManager.reloadIcons();
     int count = annotations.size();
@@ -210,12 +129,6 @@ class MarkerContainer implements Markers {
     return marker;
   }
 
-  private void ensureIconLoaded(Marker marker, MapboxMap mapboxMap) {
-    if (!(marker instanceof MarkerView)) {
-      iconManager.ensureIconLoaded(marker, mapboxMap);
-    }
-  }
-
   private List<Annotation> obtainAnnotations() {
     List<Annotation> annotations = new ArrayList<>();
     for (int i = 0; i < this.annotations.size(); i++) {
@@ -223,15 +136,4 @@ class MarkerContainer implements Markers {
     }
     return annotations;
   }
-
-  private MarkerView prepareViewMarker(BaseMarkerViewOptions markerViewOptions) {
-    MarkerView marker = markerViewOptions.getMarker();
-    Icon icon = markerViewOptions.getIcon();
-    if (icon == null) {
-      icon = IconFactory.getInstance(mapView.getContext()).defaultMarkerView();
-    }
-    iconManager.loadIconForMarkerView(marker);
-    marker.setIcon(icon);
-    return marker;
-  }
 }
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
index d646e0ac49..a58f079e27 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
@@ -3,13 +3,9 @@ package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 
 import java.util.List;
 
@@ -27,13 +23,5 @@ interface Markers {
 
   List<Marker> obtainAllIn(@NonNull RectF rectangle);
 
-  MarkerView addViewBy(@NonNull BaseMarkerViewOptions markerOptions, @NonNull MapboxMap mapboxMap,
-                       @Nullable MarkerViewManager.OnMarkerViewAddedListener onMarkerViewAddedListener);
-
-  List<MarkerView> addViewsBy(@NonNull List<? extends BaseMarkerViewOptions> markerViewOptions,
-                              @NonNull MapboxMap mapboxMap);
-
-  List<MarkerView> obtainViewsIn(@NonNull RectF rectangle);
-
   void reload();
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
index 16c73b1ca5..8e73449a61 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
@@ -24,27 +24,15 @@ public class Projection {
     this.contentPadding = new int[] {0, 0, 0, 0};
   }
 
-  void setContentPadding(int[] contentPadding, int[] userLocationViewPadding) {
+  void setContentPadding(int[] contentPadding) {
     this.contentPadding = contentPadding;
-
-    int[] padding = new int[] {
-      contentPadding[0] + userLocationViewPadding[0],
-      contentPadding[1] + userLocationViewPadding[1],
-      contentPadding[2] + userLocationViewPadding[2],
-      contentPadding[3] + userLocationViewPadding[3]
-    };
-
-    nativeMapView.setContentPadding(padding);
+    nativeMapView.setContentPadding(contentPadding);
   }
 
   int[] getContentPadding() {
     return contentPadding;
   }
 
-  public void invalidateContentPadding(int[] userLocationViewPadding) {
-    setContentPadding(contentPadding, userLocationViewPadding);
-  }
-
   /**
    * Returns the spherical Mercator projected meters for a LatLng.
    */
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
deleted file mode 100644
index 3743096824..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
+++ /dev/null
@@ -1,419 +0,0 @@
-package com.mapbox.mapboxsdk.maps;
-
-import android.location.Location;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.constants.MyBearingTracking;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
-import com.mapbox.android.core.location.LocationEngine;
-import com.mapbox.android.core.location.LocationEngineListener;
-import com.mapbox.android.core.permissions.PermissionsManager;
-
-import timber.log.Timber;
-
-/**
- * Settings for the user location and bearing tracking of a MapboxMap.
- *
- * @deprecated use location layer plugin from
- * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead.
- */
-@Deprecated
-public final class TrackingSettings {
-
-  private final MyLocationView myLocationView;
-  private final UiSettings uiSettings;
-  private final FocalPointChangeListener focalPointChangedListener;
-  private final CameraZoomInvalidator zoomInvalidator;
-  private LocationEngine locationSource;
-  private LocationEngineListener myLocationListener;
-  private boolean locationChangeAnimationEnabled = true;
-  private boolean isCustomLocationSource;
-
-  private boolean myLocationEnabled;
-  private boolean dismissLocationTrackingOnGesture = true;
-  private boolean dismissBearingTrackingOnGesture = true;
-
-  private MapboxMap.OnMyLocationTrackingModeChangeListener onMyLocationTrackingModeChangeListener;
-  private MapboxMap.OnMyBearingTrackingModeChangeListener onMyBearingTrackingModeChangeListener;
-
-  TrackingSettings(@NonNull MyLocationView myLocationView, UiSettings uiSettings,
-                   FocalPointChangeListener focalPointChangedListener, CameraZoomInvalidator zoomInvalidator) {
-    this.myLocationView = myLocationView;
-    this.focalPointChangedListener = focalPointChangedListener;
-    this.uiSettings = uiSettings;
-    this.zoomInvalidator = zoomInvalidator;
-  }
-
-  void initialise(MapboxMapOptions options) {
-    locationSource = Mapbox.getLocationEngine();
-    setMyLocationEnabled(options.getLocationEnabled());
-  }
-
-  void onSaveInstanceState(Bundle outState) {
-    outState.putInt(MapboxConstants.STATE_MY_LOCATION_TRACKING_MODE, getMyLocationTrackingMode());
-    outState.putInt(MapboxConstants.STATE_MY_BEARING_TRACKING_MODE, getMyBearingTrackingMode());
-    outState.putBoolean(MapboxConstants.STATE_MY_LOCATION_TRACKING_DISMISS, isDismissLocationTrackingOnGesture());
-    outState.putBoolean(MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, isDismissBearingTrackingOnGesture());
-    outState.putBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED, isMyLocationEnabled());
-    outState.putBoolean(MapboxConstants.STATE_LOCATION_CHANGE_ANIMATION_ENABLED, isLocationChangeAnimationEnabled());
-    outState.putBoolean(MapboxConstants.STATE_USING_CUSTOM_LOCATION_SOURCE, isCustomLocationSource());
-  }
-
-  void onRestoreInstanceState(Bundle savedInstanceState) {
-    try {
-      setMyLocationEnabled(
-        savedInstanceState.getBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED),
-        savedInstanceState.getBoolean(MapboxConstants.STATE_USING_CUSTOM_LOCATION_SOURCE)
-      );
-    } catch (SecurityException ignore) {
-      // User did not accept location permissions
-    }
-    // noinspection ResourceType
-    setMyLocationTrackingMode(savedInstanceState.getInt(
-      MapboxConstants.STATE_MY_LOCATION_TRACKING_MODE, MyLocationTracking.TRACKING_NONE));
-    // noinspection ResourceType
-    setMyBearingTrackingMode(savedInstanceState.getInt(
-      MapboxConstants.STATE_MY_BEARING_TRACKING_MODE, MyBearingTracking.NONE));
-    setDismissLocationTrackingOnGesture(savedInstanceState.getBoolean(
-      MapboxConstants.STATE_MY_LOCATION_TRACKING_DISMISS, true));
-    setDismissBearingTrackingOnGesture(savedInstanceState.getBoolean(
-      MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, true));
-    setLocationChangeAnimationEnabled(savedInstanceState.getBoolean(
-      MapboxConstants.STATE_LOCATION_CHANGE_ANIMATION_ENABLED, true));
-  }
-
-  /**
-   * <p>
-   * Set the current my location tracking mode.
-   * </p>
-   * <p>
-   * Will enable my location if not active.
-   * </p>
-   * See {@link MyLocationTracking} for different values.
-   *
-   * @param myLocationTrackingMode The location tracking mode to be used.
-   * @throws SecurityException if no suitable permission is present
-   * @see MyLocationTracking
-   */
-  @UiThread
-  public void setMyLocationTrackingMode(@MyLocationTracking.Mode int myLocationTrackingMode) {
-    myLocationView.setLocationChangeAnimationEnabled(isLocationChangeAnimationEnabled());
-    myLocationView.setMyLocationTrackingMode(myLocationTrackingMode);
-
-    if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) {
-      zoomInvalidator.zoomTo(2.0);
-      focalPointChangedListener.onFocalPointChanged(myLocationView.getCenter());
-    } else {
-      focalPointChangedListener.onFocalPointChanged(null);
-    }
-
-    if (onMyLocationTrackingModeChangeListener != null) {
-      onMyLocationTrackingModeChangeListener.onMyLocationTrackingModeChange(myLocationTrackingMode);
-    }
-  }
-
-  /**
-   * Returns the current user location tracking mode.
-   *
-   * @return The current user location tracking mode.
-   * One of the values from {@link MyLocationTracking.Mode}.
-   * @see MyLocationTracking.Mode
-   */
-  @UiThread
-  @MyLocationTracking.Mode
-  public int getMyLocationTrackingMode() {
-    return myLocationView.getMyLocationTrackingMode();
-  }
-
-  /**
-   * <p>
-   * Set the current my bearing tracking mode.
-   * </p>
-   * Shows the direction the user is heading.
-   * <p>
-   * When location tracking is disabled the direction of {@link MyLocationView} is rotated. When
-   * location tracking is enabled the {@link MapView} is rotated based on the bearing value.
-   * </p>
-   * See {@link MyBearingTracking} for different values.
-   *
-   * @param myBearingTrackingMode The bearing tracking mode to be used.
-   * @throws SecurityException if no suitable permission is present
-   * @see MyBearingTracking
-   */
-  @UiThread
-  public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) {
-    myLocationView.setMyBearingTrackingMode(myBearingTrackingMode);
-    if (onMyBearingTrackingModeChangeListener != null) {
-      onMyBearingTrackingModeChangeListener.onMyBearingTrackingModeChange(myBearingTrackingMode);
-    }
-  }
-
-  /**
-   * Returns the current user bearing tracking mode.
-   * See {@link MyBearingTracking} for possible return values.
-   *
-   * @return the current user bearing tracking mode.
-   * @see MyBearingTracking
-   */
-  @UiThread
-  @MyBearingTracking.Mode
-  public int getMyBearingTrackingMode() {
-    return myLocationView.getMyBearingTrackingMode();
-  }
-
-  /**
-   * Returns if all tracking modes will be dismissed when a gesture occurs.
-   *
-   * @return True to indicate that location and bearing tracking will be dismissed.
-   */
-  public boolean isAllDismissTrackingOnGesture() {
-    return dismissLocationTrackingOnGesture && dismissBearingTrackingOnGesture;
-  }
-
-  /**
-   * Set the dismissal of the tracking modes if a gesture occurs.
-   *
-   * @param dismissTrackingOnGesture True to dismiss all the tracking modes.
-   */
-  public void setDismissAllTrackingOnGesture(boolean dismissTrackingOnGesture) {
-    dismissLocationTrackingOnGesture = dismissTrackingOnGesture;
-    dismissBearingTrackingOnGesture = dismissTrackingOnGesture;
-  }
-
-  /**
-   * Set the dismissal of the tracking modes if a gesture occurs.
-   *
-   * @param dismissLocationTrackingOnGesture True to dismiss the location tracking mode.
-   */
-  public void setDismissLocationTrackingOnGesture(boolean dismissLocationTrackingOnGesture) {
-    this.dismissLocationTrackingOnGesture = dismissLocationTrackingOnGesture;
-  }
-
-  /**
-   * Returns if the location tracking will be disabled when a gesture occurs
-   *
-   * @return True if location tracking will be disabled.
-   */
-  public boolean isDismissLocationTrackingOnGesture() {
-    return dismissLocationTrackingOnGesture;
-  }
-
-  /**
-   * Set the dismissal of the bearing tracking modes if a gesture occurs.
-   *
-   * @param dismissBearingTrackingOnGesture True to dimsiss the bearinf tracking mode
-   */
-  public void setDismissBearingTrackingOnGesture(boolean dismissBearingTrackingOnGesture) {
-    this.dismissBearingTrackingOnGesture = dismissBearingTrackingOnGesture;
-  }
-
-  /**
-   * Returns if bearing will disabled when a gesture occurs
-   *
-   * @return True if bearing tracking will be disabled
-   */
-  public boolean isDismissBearingTrackingOnGesture() {
-    return dismissBearingTrackingOnGesture;
-  }
-
-  /**
-   * Returns if location tracking is disabled
-   *
-   * @return True if location tracking is disabled.
-   */
-  public boolean isLocationTrackingDisabled() {
-    return myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE;
-  }
-
-  /**
-   * Returns if bearing tracking disabled
-   *
-   * @return True if bearing tracking is disabled.
-   */
-  public boolean isBearingTrackingDisabled() {
-    return myLocationView.getMyBearingTrackingMode() == MyBearingTracking.NONE;
-  }
-
-  /**
-   * Returns if rotate gesture are currently enabled.
-   *
-   * @return True if rotate gestures are currently enabled.
-   */
-  public boolean isRotateGestureCurrentlyEnabled() {
-    // rotate gestures are recognised if:
-    //    The user settings are enabled AND;
-    //    EITHER bearing tracking is dismissed on gesture OR there is no bearing tracking
-    return uiSettings.isRotateGesturesEnabled()
-      && (dismissBearingTrackingOnGesture
-      || myLocationView.getMyBearingTrackingMode() == MyBearingTracking.NONE
-      || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE);
-  }
-
-  /**
-   * Returns if scroll gesture are currently enabled.
-   *
-   * @return True if scroll gestures are currently enabled.
-   */
-  public boolean isScrollGestureCurrentlyEnabled() {
-    return uiSettings.isScrollGesturesEnabled()
-      && (dismissLocationTrackingOnGesture
-      || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE);
-  }
-
-  /**
-   * Returns whether location change animation is applied for {@link MyLocationTracking#TRACKING_FOLLOW}.
-   *
-   * @return True if animation is applied, false otherwise.
-   */
-  public boolean isLocationChangeAnimationEnabled() {
-    return locationChangeAnimationEnabled;
-  }
-
-  /**
-   * Set whether location change animation should be applied for {@link MyLocationTracking#TRACKING_FOLLOW}.
-   *
-   * @param locationChangeAnimationEnabled True if animation should be applied, false otherwise.
-   */
-  public void setLocationChangeAnimationEnabled(boolean locationChangeAnimationEnabled) {
-    this.locationChangeAnimationEnabled = locationChangeAnimationEnabled;
-
-    myLocationView.setLocationChangeAnimationEnabled(locationChangeAnimationEnabled);
-  }
-
-  /**
-   * Reset the tracking modes as necessary. Location tracking is reset if the map center is changed and not from
-   * location, bearing tracking if there is a rotation.
-   *
-   * @param translate      true if translation
-   * @param rotate         true if rotation
-   * @param isFromLocation true if from location
-   */
-  void resetTrackingModesIfRequired(boolean translate, boolean rotate, boolean isFromLocation) {
-    // if tracking is on, and we should dismiss tracking with gestures, and this is a scroll action, turn tracking off
-    if (translate && !isLocationTrackingDisabled() && isDismissLocationTrackingOnGesture() && !isFromLocation) {
-      setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
-    }
-
-    // reset bearing tracking only on rotate
-    if (rotate && !isBearingTrackingDisabled() && isDismissBearingTrackingOnGesture()) {
-      setMyBearingTrackingMode(MyBearingTracking.NONE);
-    }
-  }
-
-  /**
-   * Reset the tracking modes as necessary. Animated camera position changes can reset the underlying tracking modes.
-   *
-   * @param currentCameraPosition the current camera position
-   * @param targetCameraPosition  the changed camera position
-   * @param isFromLocation        true if from location
-   */
-  void resetTrackingModesIfRequired(CameraPosition currentCameraPosition, CameraPosition targetCameraPosition,
-                                    boolean isFromLocation) {
-    if (currentCameraPosition.target != null) {
-      resetTrackingModesIfRequired(!currentCameraPosition.target.equals(targetCameraPosition.target), false,
-        isFromLocation);
-    }
-  }
-
-  Location getMyLocation() {
-    return myLocationView.getLocation();
-  }
-
-  void setOnMyLocationChangeListener(@Nullable final MapboxMap.OnMyLocationChangeListener listener) {
-    if (listener != null) {
-      myLocationListener = new LocationEngineListener() {
-        @Override
-        public void onConnected() {
-          // Nothing
-        }
-
-        @Override
-        public void onLocationChanged(Location location) {
-          if (listener != null) {
-            listener.onMyLocationChange(location);
-          }
-        }
-      };
-      locationSource.addLocationEngineListener(myLocationListener);
-    } else {
-      locationSource.removeLocationEngineListener(myLocationListener);
-      myLocationListener = null;
-    }
-  }
-
-  public boolean isCustomLocationSource() {
-    return isCustomLocationSource;
-  }
-
-  void setOnMyLocationTrackingModeChangeListener(MapboxMap.OnMyLocationTrackingModeChangeListener listener) {
-    this.onMyLocationTrackingModeChangeListener = listener;
-  }
-
-  void setOnMyBearingTrackingModeChangeListener(MapboxMap.OnMyBearingTrackingModeChangeListener listener) {
-    this.onMyBearingTrackingModeChangeListener = listener;
-  }
-
-  MyLocationView getMyLocationView() {
-    return myLocationView;
-  }
-
-
-  boolean isMyLocationEnabled() {
-    return myLocationEnabled;
-  }
-
-  void setMyLocationEnabled(boolean locationEnabled) {
-    setMyLocationEnabled(locationEnabled, isCustomLocationSource());
-  }
-
-  private void setMyLocationEnabled(boolean locationEnabled, boolean isCustomLocationSource) {
-    if (locationEnabled && !PermissionsManager.areLocationPermissionsGranted(myLocationView.getContext())) {
-      Timber.e("Could not activate user location tracking: "
-        + "user did not accept the permission or permissions were not requested.");
-      return;
-    }
-    myLocationEnabled = locationEnabled;
-    this.isCustomLocationSource = isCustomLocationSource;
-    myLocationView.setEnabled(locationEnabled, isCustomLocationSource);
-  }
-
-  void setLocationSource(LocationEngine locationSource) {
-    if (this.locationSource != null && this.locationSource.equals(locationSource)) {
-      // this source is already active
-      return;
-    }
-
-    this.isCustomLocationSource = locationSource != null;
-    if (locationSource == null) {
-      locationSource = Mapbox.getLocationEngine();
-    }
-    this.locationSource = locationSource;
-    myLocationView.setLocationSource(locationSource);
-  }
-
-  void update() {
-    if (!myLocationView.isEnabled()) {
-      return;
-    }
-    myLocationView.update();
-  }
-
-  void onStart() {
-    myLocationView.onStart();
-  }
-
-  void onStop() {
-    myLocationView.onStop();
-  }
-
-  interface CameraZoomInvalidator {
-    void zoomTo(double zoomLevel);
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 84a601039f..aa1bcae37f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -6,13 +6,11 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 
-import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
 
 import timber.log.Timber;
 
@@ -29,9 +27,6 @@ import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveStartedListener;
 final class Transform implements MapView.OnMapChangedListener {
 
   private final NativeMapView mapView;
-  private final MarkerViewManager markerViewManager;
-  private final TrackingSettings trackingSettings;
-  private final MyLocationView myLocationView;
   private final Handler handler = new Handler();
 
   private CameraPosition cameraPosition;
@@ -41,12 +36,8 @@ final class Transform implements MapView.OnMapChangedListener {
 
   private CameraChangeDispatcher cameraChangeDispatcher;
 
-  Transform(NativeMapView mapView, MarkerViewManager markerViewManager, TrackingSettings trackingSettings,
-            CameraChangeDispatcher cameraChangeDispatcher) {
+  Transform(NativeMapView mapView, CameraChangeDispatcher cameraChangeDispatcher) {
     this.mapView = mapView;
-    this.markerViewManager = markerViewManager;
-    this.trackingSettings = trackingSettings;
-    this.myLocationView = trackingSettings.getMyLocationView();
     this.cameraChangeDispatcher = cameraChangeDispatcher;
   }
 
@@ -71,18 +62,9 @@ final class Transform implements MapView.OnMapChangedListener {
     return cameraPosition;
   }
 
-  @UiThread
-  void updateCameraPosition(@NonNull CameraPosition position) {
-    if (myLocationView != null) {
-      myLocationView.setCameraPosition(position);
-    }
-    markerViewManager.setTilt((float) position.tilt);
-  }
-
   @Override
   public void onMapChanged(@MapView.MapChange int change) {
     if (change == REGION_DID_CHANGE_ANIMATED) {
-      updateCameraPosition(invalidateCameraPosition());
       if (cameraCancelableCallback != null) {
         handler.post(new Runnable() {
           @Override
@@ -103,7 +85,6 @@ final class Transform implements MapView.OnMapChangedListener {
   final void moveCamera(MapboxMap mapboxMap, CameraUpdate update, final MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
-      trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, false);
       cancelTransitions();
       cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
       mapView.jumpTo(cameraPosition.bearing, cameraPosition.target, cameraPosition.tilt, cameraPosition.zoom);
@@ -125,7 +106,6 @@ final class Transform implements MapView.OnMapChangedListener {
                         final MapboxMap.CancelableCallback callback, boolean isDismissable) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
-      trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, isDismissable);
       cancelTransitions();
       cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
 
@@ -143,7 +123,6 @@ final class Transform implements MapView.OnMapChangedListener {
                            final MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
-      trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, false);
       cancelTransitions();
       cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
 
@@ -169,10 +148,6 @@ final class Transform implements MapView.OnMapChangedListener {
         cameraChangeDispatcher.onCameraMove();
       }
 
-      if (isComponentUpdateRequired(cameraPosition)) {
-        updateCameraPosition(cameraPosition);
-      }
-
       this.cameraPosition = cameraPosition;
       if (onCameraChangeListener != null) {
         onCameraChangeListener.onCameraChange(this.cameraPosition);
@@ -181,11 +156,6 @@ final class Transform implements MapView.OnMapChangedListener {
     return cameraPosition;
   }
 
-  private boolean isComponentUpdateRequired(@NonNull CameraPosition cameraPosition) {
-    return this.cameraPosition != null && (this.cameraPosition.tilt != cameraPosition.tilt
-      || this.cameraPosition.bearing != cameraPosition.bearing);
-  }
-
   void cancelTransitions() {
     // notify user about cancel
     cameraChangeDispatcher.onCameraMoveCanceled();
@@ -297,23 +267,14 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void setBearing(double bearing) {
-    if (myLocationView != null) {
-      myLocationView.setBearing(bearing);
-    }
     mapView.setBearing(bearing);
   }
 
   void setBearing(double bearing, float focalX, float focalY) {
-    if (myLocationView != null) {
-      myLocationView.setBearing(bearing);
-    }
     mapView.setBearing(bearing, focalX, focalY);
   }
 
   void setBearing(double bearing, float focalX, float focalY, long duration) {
-    if (myLocationView != null) {
-      myLocationView.setBearing(bearing);
-    }
     mapView.setBearing(bearing, focalX, focalY, duration);
   }
 
@@ -335,10 +296,6 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void setTilt(Double pitch) {
-    if (myLocationView != null) {
-      myLocationView.setTilt(pitch);
-    }
-    markerViewManager.setTilt(pitch.floatValue());
     mapView.setPitch(pitch, 0);
   }
 
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
deleted file mode 100644
index 3f37da99d5..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
+++ /dev/null
@@ -1,1104 +0,0 @@
-package com.mapbox.mapboxsdk.maps.widgets;
-
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Camera;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PointF;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.location.Location;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.os.SystemClock;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MyBearingTracking;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Projection;
-import com.mapbox.android.core.location.LocationEngine;
-import com.mapbox.android.core.location.LocationEngineListener;
-import com.mapbox.android.core.location.LocationEnginePriority;
-
-import java.lang.ref.WeakReference;
-
-import timber.log.Timber;
-
-/**
- * UI element overlaid on a map to show the user's location.
- * <p>
- * Use {@link MyLocationViewSettings} to manipulate the state of this view.
- * </p>
- *
- * @deprecated use location layer plugin from
- * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead.
- */
-@Deprecated
-public class MyLocationView extends View {
-
-  private static final int UNDEFINED_TINT_COLOR = -1;
-  private MyLocationBehavior myLocationBehavior;
-  private MapboxMap mapboxMap;
-
-  private Projection projection;
-  private float[] projectedCoordinate = new float[2];
-  private float projectedX;
-  private float projectedY;
-
-  private float contentPaddingX;
-  private float contentPaddingY;
-
-  private LatLng latLng;
-  private Location location;
-  private LocationEngine locationEngine;
-  private long locationUpdateTimestamp;
-  private float previousDirection;
-
-  private float accuracy;
-  private Paint accuracyPaint;
-  private float accuracyThreshold;
-
-  private ValueAnimator locationChangeAnimator;
-  private ValueAnimator accuracyAnimator;
-  private ValueAnimator directionAnimator;
-  private boolean locationChangeAnimationEnabled = true;
-
-  private ValueAnimator.AnimatorUpdateListener invalidateSelfOnUpdateListener =
-    new ValueAnimator.AnimatorUpdateListener() {
-      @Override
-      public void onAnimationUpdate(ValueAnimator animation) {
-        invalidate();
-      }
-    };
-
-  private Drawable foregroundDrawable;
-  private Drawable foregroundBearingDrawable;
-  private Drawable backgroundDrawable;
-
-  private Rect foregroundBounds;
-  private Rect backgroundBounds;
-
-  private int backgroundOffsetLeft;
-  private int backgroundOffsetTop;
-  private int backgroundOffsetRight;
-  private int backgroundOffsetBottom;
-
-  private Matrix matrix;
-  private Camera camera;
-  private PointF screenLocation;
-
-  // camera vars
-  private double tilt;
-  private double bearing;
-  private float magneticHeading;
-
-  // Controls the compass update rate in milliseconds
-  private static final int COMPASS_UPDATE_RATE_MS = 500;
-
-  @MyLocationTracking.Mode
-  private int myLocationTrackingMode;
-
-  @MyBearingTracking.Mode
-  private int myBearingTrackingMode;
-
-  private GpsLocationListener userLocationListener;
-  private CompassListener compassListener;
-
-  public MyLocationView(Context context) {
-    super(context);
-    init(context);
-  }
-
-  public MyLocationView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    init(context);
-  }
-
-  public MyLocationView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    init(context);
-  }
-
-  private void init(Context context) {
-    if (isInEditMode()) {
-      return;
-    }
-
-    setEnabled(false);
-
-    // setup LayoutParams
-    ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(
-      ViewGroup.LayoutParams.MATCH_PARENT,
-      ViewGroup.LayoutParams.MATCH_PARENT);
-    setLayoutParams(lp);
-
-    matrix = new Matrix();
-    camera = new Camera();
-    camera.setLocation(0, 0, -1000);
-    accuracyPaint = new Paint();
-
-    myLocationBehavior = new MyLocationBehaviorFactory().getBehavioralModel(MyLocationTracking.TRACKING_NONE);
-    compassListener = new CompassListener(context);
-  }
-
-  @Deprecated
-  public void init(LocationEngine locationSource) {
-    this.locationEngine = locationSource;
-  }
-
-  /**
-   * Set the foreground drawable, for internal use only.
-   *
-   * @param defaultDrawable The drawable shown when showing this view
-   * @param bearingDrawable The drawable shown when tracking of bearing is enabled
-   */
-  public final void setForegroundDrawables(Drawable defaultDrawable, Drawable bearingDrawable) {
-    if (defaultDrawable == null) {
-      return;
-    }
-
-    if (bearingDrawable == null) {
-      // if user only provided one resource
-      // use same for bearing mode
-      bearingDrawable = defaultDrawable.getConstantState().newDrawable();
-    }
-
-    if (backgroundDrawable == null) {
-      // if the user didn't provide a background resource we will use the foreground resource instead,
-      // we need to create a new drawable to handle tinting correctly
-      backgroundDrawable = defaultDrawable.getConstantState().newDrawable();
-    }
-
-    if (defaultDrawable.getIntrinsicWidth() != bearingDrawable.getIntrinsicWidth()
-      || defaultDrawable.getIntrinsicHeight() != bearingDrawable.getIntrinsicHeight()) {
-      throw new RuntimeException("The dimensions from location and bearing drawables should be match");
-    }
-
-    foregroundDrawable = defaultDrawable;
-    foregroundBearingDrawable = bearingDrawable;
-
-    invalidateBounds();
-  }
-
-  /**
-   * Set the foreground drawable tint, for internal use only.
-   *
-   * @param color The color to tint the drawable with
-   */
-  public final void setForegroundDrawableTint(@ColorInt int color) {
-    applyDrawableTint(foregroundDrawable, color);
-    applyDrawableTint(foregroundBearingDrawable, color);
-    invalidate();
-  }
-
-  /**
-   * Set the shadow drawable, for internal use only.
-   *
-   * @param drawable The drawable shown as shadow
-   */
-  public final void setShadowDrawable(Drawable drawable) {
-    setShadowDrawable(drawable, 0, 0, 0, 0);
-  }
-
-  /**
-   * Set the shadow drawable with some additional offset.
-   *
-   * @param drawable The drawable shown as shadow
-   * @param left     The left offset margin
-   * @param top      The top offset margin
-   * @param right    The right offset margin
-   * @param bottom   The bottom offset margin
-   */
-  public final void setShadowDrawable(Drawable drawable, int left, int top, int right, int bottom) {
-    if (drawable != null) {
-      backgroundDrawable = drawable;
-    }
-
-    backgroundOffsetLeft = left;
-    backgroundOffsetTop = top;
-    backgroundOffsetRight = right;
-    backgroundOffsetBottom = bottom;
-
-    invalidateBounds();
-  }
-
-  /**
-   * Set the shadow drawable tint color, for internal use only.
-   *
-   * @param color The tint color to apply
-   */
-  public final void setShadowDrawableTint(@ColorInt int color) {
-    if (backgroundDrawable == null) {
-      return;
-    }
-    applyDrawableTint(backgroundDrawable, color);
-    invalidate();
-  }
-
-  /**
-   * Set the accuracy tint color, for internal use only.
-   *
-   * @param color The tint color to apply
-   */
-  public final void setAccuracyTint(@ColorInt int color) {
-    int alpha = accuracyPaint.getAlpha();
-    accuracyPaint.setColor(color);
-    accuracyPaint.setAlpha(alpha);
-    invalidate();
-  }
-
-  /**
-   * Set the accuracy alpha value, for internal use only.
-   *
-   * @param alpha The alpha accuracy value to apply
-   */
-  public final void setAccuracyAlpha(@IntRange(from = 0, to = 255) int alpha) {
-    accuracyPaint.setAlpha(alpha);
-    invalidate();
-  }
-
-  private void invalidateBounds() {
-    if (backgroundDrawable == null || foregroundDrawable == null || foregroundBearingDrawable == null) {
-      return;
-    }
-
-    int backgroundWidth = backgroundDrawable.getIntrinsicWidth();
-    int backgroundHeight = backgroundDrawable.getIntrinsicHeight();
-    int horizontalOffset = backgroundOffsetLeft - backgroundOffsetRight;
-    int verticalOffset = backgroundOffsetTop - backgroundOffsetBottom;
-    backgroundBounds = new Rect(-backgroundWidth / 2 + horizontalOffset,
-      -backgroundHeight / 2 + verticalOffset, backgroundWidth / 2 + horizontalOffset, backgroundHeight / 2
-      + verticalOffset);
-    backgroundDrawable.setBounds(backgroundBounds);
-
-    int foregroundWidth = foregroundDrawable.getIntrinsicWidth();
-    int foregroundHeight = foregroundDrawable.getIntrinsicHeight();
-    foregroundBounds = new Rect(-foregroundWidth / 2, -foregroundHeight / 2, foregroundWidth / 2, foregroundHeight / 2);
-    foregroundDrawable.setBounds(foregroundBounds);
-    foregroundBearingDrawable.setBounds(foregroundBounds);
-
-    // invoke a new draw
-    invalidate();
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas) {
-    super.onDraw(canvas);
-
-    if (location == null || foregroundBounds == null || backgroundBounds == null || accuracyAnimator == null
-      || screenLocation == null) {
-      // Not ready yet
-      return;
-    }
-
-    final PointF pointF = screenLocation;
-    float metersPerPixel = (float) projection.getMetersPerPixelAtLatitude(location.getLatitude());
-    float accuracyPixels = (Float) accuracyAnimator.getAnimatedValue() / metersPerPixel;
-
-    // reset
-    matrix.reset();
-    projectedCoordinate[0] = 0;
-    projectedCoordinate[1] = 0;
-
-    // put camera in position
-    camera.save();
-    camera.rotate((float) tilt, 0, 0);
-    camera.getMatrix(matrix);
-
-    if (myBearingTrackingMode != MyBearingTracking.NONE && directionAnimator != null) {
-      matrix.preRotate((Float) directionAnimator.getAnimatedValue());
-    }
-
-    matrix.preTranslate(0, contentPaddingY);
-    matrix.postTranslate(pointF.x, pointF.y - contentPaddingY);
-
-    // concat our matrix on canvas
-    canvas.concat(matrix);
-
-    // calculate focal point
-    matrix.mapPoints(projectedCoordinate);
-    projectedX = pointF.x - projectedCoordinate[0];
-    projectedY = pointF.y - projectedCoordinate[1];
-
-    // restore orientation from camera
-    camera.restore();
-
-    // draw circle
-    canvas.drawCircle(0, 0, accuracyPixels, accuracyPaint);
-
-    // draw shadow
-    if (backgroundDrawable != null) {
-      backgroundDrawable.draw(canvas);
-    }
-
-    // draw foreground
-    if (myBearingTrackingMode == MyBearingTracking.NONE) {
-      if (foregroundDrawable != null) {
-        foregroundDrawable.draw(canvas);
-      }
-    } else if (foregroundBearingDrawable != null && foregroundBounds != null) {
-      if (myBearingTrackingMode == MyBearingTracking.GPS
-        || myBearingTrackingMode == MyBearingTracking.GPS_NORTH_FACING
-        || compassListener.isSensorAvailable()) {
-        foregroundBearingDrawable.draw(canvas);
-      } else {
-        // We are tracking MyBearingTracking.COMPASS, but sensor is not available.
-        foregroundDrawable.draw(canvas);
-      }
-    }
-  }
-
-  /**
-   * Set the tilt value, for internal use only.
-   *
-   * @param tilt The tilt to apply
-   */
-  public void setTilt(@FloatRange(from = 0, to = 60.0f) double tilt) {
-    this.tilt = tilt;
-    invalidate();
-  }
-
-  /**
-   * Set the bearing value, for internal use only.
-   *
-   * @param bearing The bearing to apply
-   */
-  public void setBearing(double bearing) {
-    this.bearing = bearing;
-    if (myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) {
-      if (myBearingTrackingMode == MyBearingTracking.GPS
-        || myBearingTrackingMode == MyBearingTracking.GPS_NORTH_FACING) {
-        if (location != null) {
-          setCompass(location.getBearing() - bearing);
-        }
-      } else if (myBearingTrackingMode == MyBearingTracking.COMPASS && compassListener.isSensorAvailable()) {
-        setCompass(magneticHeading - bearing);
-      }
-    }
-  }
-
-  /**
-   * Set the bearing and tilt from a camera position, for internal use only.
-   *
-   * @param position The camera position to extract bearing and tilt from
-   */
-  public void setCameraPosition(CameraPosition position) {
-    if (position != null) {
-      setBearing(position.bearing);
-      setTilt(position.tilt);
-    }
-  }
-
-  /**
-   * Called when the hosting activity is starting, for internal use only.
-   */
-  public void onStart() {
-    if (myBearingTrackingMode == MyBearingTracking.COMPASS && compassListener.isSensorAvailable()) {
-      compassListener.onResume();
-    }
-    if (isEnabled()) {
-      toggleGps(true);
-    }
-  }
-
-  /**
-   * Called when the hosting activity is stopping, for internal use only.
-   */
-  public void onStop() {
-    compassListener.onPause();
-    toggleGps(false);
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    // cleanup to prevent memory leaks
-    if (locationChangeAnimator != null) {
-      locationChangeAnimator.cancel();
-      locationChangeAnimator = null;
-    }
-
-    if (accuracyAnimator != null) {
-      accuracyAnimator.cancel();
-      accuracyAnimator = null;
-    }
-
-    if (directionAnimator != null) {
-      directionAnimator.cancel();
-      directionAnimator = null;
-    }
-
-    if (userLocationListener != null) {
-      locationEngine.removeLocationEngineListener(userLocationListener);
-      locationEngine = null;
-      userLocationListener = null;
-    }
-  }
-
-  /**
-   * Update current locationstate.
-   */
-  public void update() {
-    if (isEnabled()) {
-      myLocationBehavior.invalidate();
-    } else {
-      setVisibility(View.INVISIBLE);
-    }
-  }
-
-  // TODO refactor MapboxMap out
-  public void setMapboxMap(MapboxMap mapboxMap) {
-    this.mapboxMap = mapboxMap;
-    this.projection = mapboxMap.getProjection();
-  }
-
-  /**
-   * Set the enabled state, for internal use only.
-   *
-   * @param enabled The value to set the state to
-   */
-  @Override
-  public void setEnabled(boolean enabled) {
-    setEnabled(enabled, false);
-  }
-
-  /**
-   * Set the enabled state, for internal use only.
-   *
-   * @param enabled                The value to set the state to
-   * @param isCustomLocationEngine Flag handling for handling user provided custom location engine
-   */
-  public void setEnabled(boolean enabled, boolean isCustomLocationEngine) {
-    super.setEnabled(enabled);
-    setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
-    toggleGps(enabled, isCustomLocationEngine);
-  }
-
-  /**
-   * Save the view instance state, for internal use only.
-   *
-   * @return the marshaled representation of the view state
-   */
-  @Override
-  protected Parcelable onSaveInstanceState() {
-    Bundle bundle = new Bundle();
-    bundle.putParcelable("superState", super.onSaveInstanceState());
-    bundle.putDouble("tilt", tilt);
-    return bundle;
-  }
-
-  /**
-   * Restore the view instance state, for internal use only.
-   *
-   * @param state the marshalled representation of the state to restore
-   */
-  @Override
-  public void onRestoreInstanceState(Parcelable state) {
-    if (state instanceof Bundle) {
-      Bundle bundle = (Bundle) state;
-      tilt = bundle.getDouble("tilt");
-      state = bundle.getParcelable("superState");
-    }
-    super.onRestoreInstanceState(state);
-  }
-
-  private void toggleGps(boolean enableGps) {
-    toggleGps(enableGps, mapboxMap != null
-      && mapboxMap.getTrackingSettings().isCustomLocationSource());
-  }
-
-  /**
-   * Enabled / Disable GPS location updates along with updating the UI, for internal use only.
-   *
-   * @param enableGps true if GPS is to be enabled, false if GPS is to be disabled
-   */
-  private void toggleGps(boolean enableGps, boolean isCustomLocationEngine) {
-    if (enableGps) {
-      if (locationEngine == null) {
-        if (!isCustomLocationEngine) {
-          locationEngine = Mapbox.getLocationEngine();
-        } else {
-          return;
-        }
-      }
-
-      if (userLocationListener == null) {
-        userLocationListener = new GpsLocationListener(this, locationEngine);
-      }
-
-      locationEngine.addLocationEngineListener(userLocationListener);
-      locationEngine.setPriority(LocationEnginePriority.HIGH_ACCURACY);
-      locationEngine.activate();
-    } else {
-      if (locationEngine == null) {
-        return;
-      }
-      // Disable location and user dot
-      location = null;
-      locationEngine.removeLocationEngineListener(userLocationListener);
-      locationEngine.removeLocationUpdates();
-      locationEngine.deactivate();
-      restoreLocationEngine();
-    }
-  }
-
-  /**
-   * Get the current location.
-   *
-   * @return the current location
-   */
-  public Location getLocation() {
-    return location;
-  }
-
-  /**
-   * Set the current location, for internal use only.
-   *
-   * @param location The current location
-   */
-  public void setLocation(Location location) {
-    if (location == null) {
-      this.location = null;
-      return;
-    }
-
-    this.location = location;
-    myLocationBehavior.updateLatLng(location);
-
-    if (mapboxMap != null && (myBearingTrackingMode == MyBearingTracking.GPS
-      || myBearingTrackingMode == MyBearingTracking.GPS_NORTH_FACING)
-      && myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) {
-      setBearing(mapboxMap.getCameraPosition().bearing);
-    }
-  }
-
-  /**
-   * Set location change animation enabled, for internal use only.
-   *
-   * @param locationChangeAnimationEnabled True if location changes are animated
-   */
-  public void setLocationChangeAnimationEnabled(boolean locationChangeAnimationEnabled) {
-    this.locationChangeAnimationEnabled = locationChangeAnimationEnabled;
-  }
-
-  /**
-   * Set accuracy circle threshold. Circle won't be displayed if accuracy is below set value.
-   * For internal use only.
-   *
-   * @param accuracyThreshold Value below which circle won't be displayed
-   */
-  public void setAccuracyThreshold(float accuracyThreshold) {
-    this.accuracyThreshold = accuracyThreshold;
-  }
-
-  /**
-   * Set the bearing tracking mode, for internal use only.
-   *
-   * @param myBearingTrackingMode The bearing tracking mode
-   */
-  public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) {
-    this.myBearingTrackingMode = myBearingTrackingMode;
-    if (myBearingTrackingMode == MyBearingTracking.COMPASS && compassListener.isSensorAvailable()) {
-      compassListener.onResume();
-    } else {
-      compassListener.onPause();
-      if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW
-        && myBearingTrackingMode == MyBearingTracking.GPS) {
-        // always face north
-        setCompass(0);
-      } else {
-        myLocationBehavior.invalidate();
-      }
-    }
-    invalidate();
-  }
-
-  /**
-   * Set the location tracking mode, for internla use only.
-   *
-   * @param myLocationTrackingMode The location tracking mode
-   */
-  public void setMyLocationTrackingMode(@MyLocationTracking.Mode int myLocationTrackingMode) {
-    MyLocationBehaviorFactory factory = new MyLocationBehaviorFactory();
-    myLocationBehavior = factory.getBehavioralModel(myLocationTrackingMode);
-
-    if (location != null) {
-      if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) {
-        // center map directly
-        mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(location)));
-      } else {
-        // do not use interpolated location from tracking mode
-        latLng = null;
-      }
-      myLocationBehavior.updateLatLng(location);
-    }
-
-    this.myLocationTrackingMode = myLocationTrackingMode;
-    invalidate();
-  }
-
-  /**
-   * Get the location tracking mode, for internal use only.
-   *
-   * @return The location tracking mode
-   */
-  @MyLocationTracking.Mode
-  public int getMyLocationTrackingMode() {
-    return myLocationTrackingMode;
-  }
-
-
-  /**
-   * Get the bearing tracking mode, for internal use only.
-   *
-   * @return the bearing tracking mode
-   */
-  @MyBearingTracking.Mode
-  public int getMyBearingTrackingMode() {
-    return myBearingTrackingMode;
-  }
-
-  /**
-   * Set the compass bearing value, for internal use only.
-   *
-   * @param bearing The compas bearing value
-   */
-  private void setCompass(double bearing) {
-    setCompass(bearing, 0 /* no animation */);
-  }
-
-  private void setCompass(double bearing, long duration) {
-    float oldDir = previousDirection;
-    if (directionAnimator != null) {
-      oldDir = (Float) directionAnimator.getAnimatedValue();
-      directionAnimator.end();
-      directionAnimator = null;
-    }
-
-    float newDir = (float) bearing;
-    float diff = oldDir - newDir;
-    if (diff > 180.0f) {
-      newDir += 360.0f;
-    } else if (diff < -180.0f) {
-      newDir -= 360.f;
-    }
-    previousDirection = newDir;
-
-    directionAnimator = ValueAnimator.ofFloat(oldDir, newDir);
-    directionAnimator.setDuration(duration);
-    directionAnimator.addUpdateListener(invalidateSelfOnUpdateListener);
-    directionAnimator.start();
-  }
-
-  /**
-   * Get the center of this view in screen coordinates.
-   *
-   * @return the center of the view
-   */
-  public PointF getCenter() {
-    return new PointF(getCenterX(), getCenterY());
-  }
-
-  /**
-   * Get the x value of the center of this view.
-   *
-   * @return the x value of the center of the view
-   */
-  private float getCenterX() {
-    return (getX() + getMeasuredWidth()) / 2 + contentPaddingX - projectedX;
-  }
-
-  /**
-   * Get the y value of the center of this view.
-   *
-   * @return the y value of the center of the view
-   */
-  private float getCenterY() {
-    return (getY() + getMeasuredHeight()) / 2 + contentPaddingY - projectedY;
-  }
-
-  public void setContentPadding(int[] padding) {
-    contentPaddingX = (padding[0] - padding[2]) / 2;
-    contentPaddingY = (padding[1] - padding[3]) / 2;
-  }
-
-  /**
-   * Set the location source from which location updates are received, for internal use only.
-   *
-   * @param locationEngine The location engine to receive updates from
-   */
-  public void setLocationSource(LocationEngine locationEngine) {
-    toggleGps(false);
-    this.locationEngine = locationEngine;
-    this.userLocationListener = null;
-    setEnabled(isEnabled(), locationEngine != 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 void restoreLocationEngine() {
-    locationEngine.setPriority(LocationEnginePriority.LOW_POWER);
-    locationEngine.activate();
-  }
-
-  private static class GpsLocationListener implements LocationEngineListener {
-
-    private WeakReference<MyLocationView> userLocationView;
-    private WeakReference<LocationEngine> locationSource;
-
-    GpsLocationListener(MyLocationView myLocationView, LocationEngine locationEngine) {
-      userLocationView = new WeakReference<>(myLocationView);
-      locationSource = new WeakReference<>(locationEngine);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onConnected() {
-      MyLocationView locationView = userLocationView.get();
-      LocationEngine locationEngine = locationSource.get();
-      if (locationView != null && locationEngine != null) {
-        Location lastKnownLocation = locationEngine.getLastLocation();
-        if (lastKnownLocation != null) {
-          locationView.setLocation(lastKnownLocation);
-        }
-        locationEngine.requestLocationUpdates();
-      }
-    }
-
-    /**
-     * Callback method for receiving location updates from LocationServices.
-     *
-     * @param location The new Location data
-     */
-    @Override
-    public void onLocationChanged(Location location) {
-      MyLocationView locationView = userLocationView.get();
-      if (locationView != null) {
-        locationView.setLocation(location);
-      }
-    }
-  }
-
-  private class CompassListener implements SensorEventListener {
-
-    private final SensorManager sensorManager;
-
-    private Sensor rotationVectorSensor;
-    private float[] matrix = new float[9];
-    private float[] rotationVectorValue;
-    private float[] truncatedRotationVectorValue = new float[4];
-
-    private float[] orientation = new float[3];
-    private boolean reportMissingSensor = true;
-    // Compass data
-    private long compassUpdateNextTimestamp = 0;
-
-    CompassListener(Context context) {
-      sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-      rotationVectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
-    }
-
-    public void onResume() {
-      sensorManager.registerListener(this, rotationVectorSensor, SensorManager.SENSOR_DELAY_GAME);
-    }
-
-    public void onPause() {
-      sensorManager.unregisterListener(this, rotationVectorSensor);
-    }
-
-    public boolean isSensorAvailable() {
-      if (rotationVectorSensor == null && reportMissingSensor) {
-        reportMissingSensor = false;
-        Timber.e("Sensor.TYPE_ROTATION_VECTOR is missing from this device. Unable to use MyBearingTracking.COMPASS.");
-      }
-      return rotationVectorSensor != null;
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-
-      // check when the last time the compass was updated, return if too soon.
-      long currentTime = SystemClock.elapsedRealtime();
-      if (currentTime < compassUpdateNextTimestamp) {
-        return;
-      }
-
-      if (event.sensor.getType() == Sensor.TYPE_ROTATION_VECTOR) {
-        rotationVectorValue = getRotationVectorFromSensorEvent(event);
-        SensorManager.getRotationMatrixFromVector(matrix, rotationVectorValue);
-        SensorManager.getOrientation(matrix, orientation);
-
-        magneticHeading = (float) Math.toDegrees(SensorManager.getOrientation(matrix, orientation)[0]);
-        if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) {
-          // Change the user location view orientation to reflect the device orientation
-          rotateCamera(magneticHeading);
-          setCompass(0, COMPASS_UPDATE_RATE_MS);
-        } else {
-          // Change compass direction
-          setCompass(magneticHeading - bearing, COMPASS_UPDATE_RATE_MS);
-        }
-
-        compassUpdateNextTimestamp = currentTime + COMPASS_UPDATE_RATE_MS;
-      }
-    }
-
-    /**
-     * Pulls out the rotation vector from a SensorEvent, with a maximum length
-     * vector of four elements to avoid potential compatibility issues.
-     *
-     * @param event the sensor event
-     * @return the events rotation vector, potentially truncated
-     */
-    @NonNull
-    float[] getRotationVectorFromSensorEvent(@NonNull SensorEvent event) {
-      if (event.values.length > 4) {
-        // On some Samsung devices SensorManager.getRotationMatrixFromVector
-        // appears to throw an exception if rotation vector has length > 4.
-        // For the purposes of this class the first 4 values of the
-        // rotation vector are sufficient (see crbug.com/335298 for details).
-        // Only affects Android 4.3
-        System.arraycopy(event.values, 0, truncatedRotationVectorValue, 0, 4);
-        return truncatedRotationVectorValue;
-      } else {
-        return event.values;
-      }
-    }
-
-    private void rotateCamera(float rotation) {
-      CameraPosition.Builder builder = new CameraPosition.Builder();
-      builder.bearing(rotation);
-      mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(builder.build()), COMPASS_UPDATE_RATE_MS,
-        false /*linear interpolator*/, null);
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-    }
-
-  }
-
-  private class MarkerCoordinateAnimatorListener implements ValueAnimator.AnimatorUpdateListener {
-
-    private MyLocationBehavior behavior;
-    private double fromLat;
-    private double fromLng;
-    private double toLat;
-    private double toLng;
-
-    private MarkerCoordinateAnimatorListener(MyLocationBehavior myLocationBehavior, LatLng from, LatLng to) {
-      behavior = myLocationBehavior;
-      fromLat = from.getLatitude();
-      fromLng = from.getLongitude();
-      toLat = to.getLatitude();
-      toLng = to.getLongitude();
-    }
-
-    @Override
-    public void onAnimationUpdate(ValueAnimator animation) {
-      float frac = animation.getAnimatedFraction();
-      double latitude = fromLat + (toLat - fromLat) * frac;
-      double longitude = fromLng + (toLng - fromLng) * frac;
-      behavior.updateLatLng(latitude, longitude);
-      update();
-    }
-  }
-
-  private class MyLocationBehaviorFactory {
-
-    MyLocationBehavior getBehavioralModel(@MyLocationTracking.Mode int mode) {
-      if (mode == MyLocationTracking.TRACKING_NONE) {
-        return new MyLocationShowBehavior();
-      } else {
-        return new MyLocationTrackingBehavior();
-      }
-    }
-  }
-
-  private abstract class MyLocationBehavior {
-
-    MyLocationBehavior() {
-      if (latLng != null) {
-        locationUpdateTimestamp = SystemClock.elapsedRealtime();
-      }
-    }
-
-    void updateLatLng(@NonNull Location newLocation) {
-      location = newLocation;
-    }
-
-    void updateLatLng(double lat, double lon) {
-      if (latLng != null) {
-        latLng.setLatitude(lat);
-        latLng.setLongitude(lon);
-      }
-    }
-
-    void updateAccuracy(@NonNull Location location) {
-      if (accuracyAnimator != null && accuracyAnimator.isRunning()) {
-        // use current accuracy as a starting point
-        accuracy = (Float) accuracyAnimator.getAnimatedValue();
-        accuracyAnimator.end();
-      }
-
-      float newAccuracy = location.getAccuracy() >= accuracyThreshold ? location.getAccuracy() : 0f;
-      accuracyAnimator = ValueAnimator.ofFloat(accuracy, newAccuracy);
-      accuracyAnimator.setDuration(750);
-      accuracyAnimator.start();
-      accuracy = newAccuracy;
-    }
-
-    abstract void invalidate();
-  }
-
-  private class MyLocationTrackingBehavior extends MyLocationBehavior {
-
-    @Override
-    void updateLatLng(@NonNull Location location) {
-      super.updateLatLng(location);
-      if (latLng == null) {
-        // first location fix
-        latLng = new LatLng(location);
-        locationUpdateTimestamp = SystemClock.elapsedRealtime();
-      }
-
-      // updateLatLng timestamp
-      float previousUpdateTimeStamp = locationUpdateTimestamp;
-      locationUpdateTimestamp = SystemClock.elapsedRealtime();
-
-      // calculate animation duration
-      int animationDuration;
-      if (previousUpdateTimeStamp == 0) {
-        animationDuration = 0;
-      } else {
-        animationDuration = (int) ((locationUpdateTimestamp - previousUpdateTimeStamp) * 1.1f)
-        /*make animation slightly longer*/;
-      }
-
-      // calculate interpolated location
-      latLng = new LatLng(location);
-      CameraPosition.Builder builder = new CameraPosition.Builder().target(latLng);
-
-      // add direction
-      if (myBearingTrackingMode == MyBearingTracking.GPS) {
-        if (location.hasBearing()) {
-          builder.bearing(location.getBearing());
-        }
-        setCompass(0, COMPASS_UPDATE_RATE_MS);
-      }
-
-      if (myBearingTrackingMode == MyBearingTracking.GPS_NORTH_FACING) {
-        builder.bearing(0);
-        if (location.hasBearing()) {
-          setCompass(location.getBearing(), COMPASS_UPDATE_RATE_MS);
-        }
-      }
-
-      // accuracy
-      updateAccuracy(location);
-
-      if (locationChangeAnimationEnabled && animationDuration > 0) {
-        // ease to new camera position with a linear interpolator
-        mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(builder.build()), animationDuration, false, null,
-          true);
-      } else {
-        mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(builder.build()));
-      }
-    }
-
-    @Override
-    void invalidate() {
-      int[] mapPadding = mapboxMap.getPadding();
-      float x = (getWidth() + mapPadding[0] - mapPadding[2]) / 2 + contentPaddingX;
-      float y = (getHeight() - mapPadding[3] + mapPadding[1]) / 2 + contentPaddingY;
-      screenLocation = new PointF(x, y);
-      MyLocationView.this.invalidate();
-    }
-  }
-
-  private class MyLocationShowBehavior extends MyLocationBehavior {
-
-    @Override
-    void updateLatLng(@NonNull final Location location) {
-      super.updateLatLng(location);
-      if (latLng == null) {
-        // first location update
-        latLng = new LatLng(location);
-        locationUpdateTimestamp = SystemClock.elapsedRealtime();
-      }
-
-      // update LatLng location
-      LatLng newLocation = new LatLng(location);
-
-      // update LatLng accuracy
-      updateAccuracy(location);
-
-      // calculate updateLatLng time + add some extra offset to improve animation
-      long previousUpdateTimeStamp = locationUpdateTimestamp;
-      locationUpdateTimestamp = SystemClock.elapsedRealtime();
-      long locationUpdateDuration = (long) ((locationUpdateTimestamp - previousUpdateTimeStamp) * 1.2f);
-
-      // animate changes
-      if (locationChangeAnimator != null) {
-        locationChangeAnimator.end();
-        locationChangeAnimator = null;
-      }
-
-      locationChangeAnimator = ValueAnimator.ofFloat(0.0f, 1.0f);
-      if (locationChangeAnimationEnabled) {
-        locationChangeAnimator.setDuration(locationUpdateDuration);
-      } else {
-        locationChangeAnimator.setDuration(0);
-      }
-      locationChangeAnimator.addUpdateListener(new MarkerCoordinateAnimatorListener(this,
-        latLng, newLocation
-      ));
-      locationChangeAnimator.start();
-      latLng = newLocation;
-    }
-
-    @Override
-    void invalidate() {
-      if (latLng != null) {
-        screenLocation = projection.toScreenLocation(latLng);
-      }
-      MyLocationView.this.invalidate();
-    }
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
deleted file mode 100644
index ec7c53e1d0..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package com.mapbox.mapboxsdk.maps.widgets;
-
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.maps.FocalPointChangeListener;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.Projection;
-import com.mapbox.mapboxsdk.utils.BitmapUtils;
-
-/**
- * Settings to configure the visual appearance of the MyLocationView.
- *
- * @deprecated use location layer plugin from
- * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead.
- */
-@Deprecated
-public class MyLocationViewSettings {
-
-  private Projection projection;
-  private MyLocationView myLocationView;
-  private FocalPointChangeListener focalPointChangeListener;
-
-  //
-  // State
-  //
-
-  private boolean enabled;
-
-  //
-  // Foreground
-  //
-
-  private Drawable foregroundDrawable;
-  private Drawable foregroundBearingDrawable;
-
-  @ColorInt
-  private int foregroundTintColor;
-
-  //
-  // Background
-  //
-
-  private Drawable backgroundDrawable;
-  private int[] backgroundOffset = new int[4];
-
-  @ColorInt
-  private int backgroundTintColor;
-
-  //
-  // Accuracy
-  //
-
-  private int accuracyAlpha;
-  private float accuracyThreshold = 0f;
-
-  @ColorInt
-  private int accuracyTintColor;
-
-  //
-  // Padding
-  //
-
-  private int[] padding = new int[4];
-
-  /**
-   * Creates an instance of MyLocationViewSettings
-   * <p>
-   *
-   * @param myLocationView            the MyLocationView to apply the settings to
-   * @param projection                the MapView projection
-   * @param focalPointChangedListener the interface to be invoked when focal points changes
-   * @see MyLocationView
-   */
-  public MyLocationViewSettings(MyLocationView myLocationView, Projection projection, FocalPointChangeListener
-    focalPointChangedListener) {
-    this.myLocationView = myLocationView;
-    this.projection = projection;
-    this.focalPointChangeListener = focalPointChangedListener;
-  }
-
-  /**
-   * Initialise this with MapboxMapOptions.
-   *
-   * @param options the options to initialise this class from
-   */
-  public void initialise(@NonNull MapboxMapOptions options) {
-    CameraPosition position = options.getCamera();
-    if (position != null && !position.equals(CameraPosition.DEFAULT)) {
-      setTilt(position.tilt);
-    }
-    setForegroundDrawable(options.getMyLocationForegroundDrawable(), options.getMyLocationForegroundBearingDrawable());
-    setForegroundTintColor(options.getMyLocationForegroundTintColor());
-    setBackgroundDrawable(options.getMyLocationBackgroundDrawable(), options.getMyLocationBackgroundPadding());
-    setBackgroundTintColor(options.getMyLocationBackgroundTintColor());
-    setAccuracyAlpha(options.getMyLocationAccuracyAlpha());
-    setAccuracyTintColor(options.getMyLocationAccuracyTintColor());
-    setAccuracyThreshold(options.getMyLocationAccuracyThreshold());
-  }
-
-  public void onSaveInstanceState(Bundle outState) {
-    outState.putBoolean(MapboxConstants.STATE_LOCATION_VIEW_ENABLED, isEnabled());
-    outState.putByteArray(
-      MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_DRAWABLE,
-      BitmapUtils.getByteArrayFromDrawable(getForegroundDrawable())
-    );
-    outState.putByteArray(
-      MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_BEARING_DRAWABLE,
-      BitmapUtils.getByteArrayFromDrawable(getForegroundBearingDrawable())
-    );
-    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_TINT_COLOR, getForegroundTintColor());
-    outState.putByteArray(
-      MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_DRAWABLE,
-      BitmapUtils.getByteArrayFromDrawable(getBackgroundDrawable())
-    );
-    outState.putIntArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_OFFSET, getBackgroundOffset());
-    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_TINT_COLOR, getBackgroundTintColor());
-    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_ALPHA, getAccuracyAlpha());
-    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_TINT_COLOR, getAccuracyTintColor());
-    outState.putFloat(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_THRESHOLD, getAccuracyThreshold());
-    outState.putIntArray(MapboxConstants.STATE_LOCATION_VIEW_PADDING, getPadding());
-  }
-
-  public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-    setEnabled(savedInstanceState.getBoolean(MapboxConstants.STATE_LOCATION_VIEW_ENABLED));
-    setForegroundDrawable(
-      BitmapUtils.getDrawableFromByteArray(
-        myLocationView.getContext(),
-        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_DRAWABLE)
-      ),
-      BitmapUtils.getDrawableFromByteArray(
-        myLocationView.getContext(),
-        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_BEARING_DRAWABLE)
-      )
-    );
-    setForegroundTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_TINT_COLOR));
-    setBackgroundDrawable(
-      BitmapUtils.getDrawableFromByteArray(
-        myLocationView.getContext(),
-        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_DRAWABLE)
-      ),
-      savedInstanceState.getIntArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_OFFSET)
-    );
-    setBackgroundTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_TINT_COLOR));
-    setAccuracyAlpha(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_ALPHA));
-    setAccuracyTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_TINT_COLOR));
-    setAccuracyThreshold(savedInstanceState.getFloat(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_THRESHOLD));
-    setPadding(savedInstanceState.getIntArray(MapboxConstants.STATE_LOCATION_VIEW_PADDING));
-  }
-
-  /**
-   * Returns if the MyLocationView is enabled
-   *
-   * @return true if MyLocationView is enabled,
-   */
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  /**
-   * Set the enabled state of MyLocationView
-   *
-   * @param enabled true shows the MyLocationView on the map
-   */
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-    myLocationView.setEnabled(enabled);
-  }
-
-  /**
-   * Set the foreground drawable of the MyLocationView
-   * <p>
-   * The foreground drawable is the image visible on screen
-   * </p>
-   * It's linked with the foreground tint color
-   *
-   * @param foregroundDrawable        the drawable to show as foreground without bearing
-   * @param foregroundBearingDrawable the drawable to show as foreground when bearing is enabled
-   */
-  public void setForegroundDrawable(Drawable foregroundDrawable, Drawable foregroundBearingDrawable) {
-    this.foregroundDrawable = foregroundDrawable;
-    this.foregroundBearingDrawable = foregroundBearingDrawable;
-    myLocationView.setForegroundDrawables(foregroundDrawable, foregroundBearingDrawable);
-    myLocationView.setForegroundDrawableTint(foregroundTintColor);
-  }
-
-  /**
-   * Get the foreground drawable when bearing is disabled.
-   *
-   * @return the drawable used as foreground
-   */
-  public Drawable getForegroundDrawable() {
-    return foregroundDrawable;
-  }
-
-  /**
-   * Get the foreground drawable when bearing is enabled.
-   *
-   * @return the bearing drawable used as foreground
-   */
-  public Drawable getForegroundBearingDrawable() {
-    return foregroundBearingDrawable;
-  }
-
-  /**
-   * Set the foreground tint color.
-   * <p>
-   * The color will tint both the foreground and the bearing foreground drawable.
-   * </p>
-   *
-   * @param foregroundTintColor the color to tint the foreground drawable or -1 (undefined color) to remove the
-   *                            existing foreground tint color
-   */
-  public void setForegroundTintColor(@ColorInt int foregroundTintColor) {
-    this.foregroundTintColor = foregroundTintColor;
-    myLocationView.setForegroundDrawableTint(foregroundTintColor);
-  }
-
-  /**
-   * Get the foreground tint color.
-   *
-   * @return the foreground tint color
-   */
-  public int getForegroundTintColor() {
-    return foregroundTintColor;
-  }
-
-  /**
-   * Set the background drawable of MyLocationView
-   * <p>
-   * Padding can be added to provide an offset to the background
-   * </p>
-   * It's linked with the background tint color
-   *
-   * @param backgroundDrawable the drawable to show as background
-   * @param padding            the padding added to the background
-   */
-  public void setBackgroundDrawable(Drawable backgroundDrawable, int[] padding) {
-    this.backgroundDrawable = backgroundDrawable;
-    this.backgroundOffset = padding;
-    if (padding != null && padding.length == 4) {
-      myLocationView.setShadowDrawable(backgroundDrawable, padding[0], padding[1], padding[2], padding[3]);
-    } else {
-      myLocationView.setShadowDrawable(backgroundDrawable);
-    }
-    myLocationView.setShadowDrawableTint(backgroundTintColor);
-  }
-
-  /**
-   * Get the background drawable of MyLocationView.
-   *
-   * @return the drawable used as background
-   */
-  public Drawable getBackgroundDrawable() {
-    return backgroundDrawable;
-  }
-
-  /**
-   * Set the background tint color.
-   *
-   * @param backgroundTintColor the color to tint the background drawable or -1 (undefined color) to remove the
-   *                            existing background tint color
-   */
-  public void setBackgroundTintColor(@ColorInt int backgroundTintColor) {
-    this.backgroundTintColor = backgroundTintColor;
-    myLocationView.setShadowDrawableTint(backgroundTintColor);
-  }
-
-  /**
-   * Get the background tint color.
-   *
-   * @return the background tint color
-   */
-  public int getBackgroundTintColor() {
-    return backgroundTintColor;
-  }
-
-  /**
-   * Get the background offset.
-   *
-   * @return the background offset
-   */
-  public int[] getBackgroundOffset() {
-    return backgroundOffset;
-  }
-
-  /**
-   * Set the MyLocationView padding.
-   *
-   * @param left   the padding left of MyLocationView
-   * @param top    the padding top of MyLocationView
-   * @param right  the padding right of MyLocationView
-   * @param bottom the padding bottom of MyLocaionView
-   */
-  public void setPadding(int left, int top, int right, int bottom) {
-    padding = new int[] {left, top, right, bottom};
-    setPadding(padding);
-  }
-
-  private void setPadding(int[] padding) {
-    myLocationView.setContentPadding(padding);
-    projection.invalidateContentPadding(padding);
-    invalidateFocalPointForTracking(myLocationView);
-  }
-
-  /**
-   * Get the MyLocationView padding.
-   *
-   * @return an array describing the padding in a LTRB manner
-   */
-  public int[] getPadding() {
-    return padding;
-  }
-
-  /**
-   * Get the alpha value of the accuracy circle of MyLocationView
-   *
-   * @return the alpha value
-   */
-  public int getAccuracyAlpha() {
-    return accuracyAlpha;
-  }
-
-  /**
-   * Set the alpha value of the accuracy circle of MyLocationView
-   *
-   * @param accuracyAlpha the alpha value to set
-   */
-  public void setAccuracyAlpha(@IntRange(from = 0, to = 255) int accuracyAlpha) {
-    this.accuracyAlpha = accuracyAlpha;
-    myLocationView.setAccuracyAlpha(accuracyAlpha);
-  }
-
-  /**
-   * Get the accuracy tint color of MyLocationView.
-   *
-   * @return the tint color used for accuracy
-   */
-  public int getAccuracyTintColor() {
-    return accuracyTintColor;
-  }
-
-  /**
-   * Set the accuracy tint color of MyLocationView.
-   *
-   * @param accuracyTintColor the accuracy tint color
-   */
-  public void setAccuracyTintColor(@ColorInt int accuracyTintColor) {
-    this.accuracyTintColor = accuracyTintColor;
-    myLocationView.setAccuracyTint(accuracyTintColor);
-  }
-
-  /**
-   * Returns current accuracy threshold value (in meters).
-   *
-   * @return Value of accuracy threshold (in meters), below which circle won't be displayed
-   */
-  public float getAccuracyThreshold() {
-    return accuracyThreshold;
-  }
-
-  /**
-   * Set accuracy circle threshold. Circle won't be displayed if accuracy is below set value.
-   *
-   * @param accuracyThreshold Value of accuracy (in meters), below which circle won't be displayed
-   */
-  public void setAccuracyThreshold(float accuracyThreshold) {
-    this.accuracyThreshold = accuracyThreshold;
-    myLocationView.setAccuracyThreshold(accuracyThreshold);
-  }
-
-  public void setTilt(double tilt) {
-    myLocationView.setTilt(tilt);
-  }
-
-  private void invalidateFocalPointForTracking(MyLocationView myLocationView) {
-    if (!(myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE)) {
-      focalPointChangeListener.onFocalPointChanged(myLocationView.getCenter());
-    } else {
-      focalPointChangeListener.onFocalPointChanged(null);
-    }
-  }
-}