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

67 files changed, 32 insertions, 2898 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 9e64e03e11..785fda173d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -69,17 +69,6 @@
                 android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
-            android:name=".activity.annotation.AnimatedMarkerActivity"
-            android:description="@string/description_animated_marker"
-            android:label="@string/activity_animated_marker">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
             android:name=".activity.annotation.DynamicMarkerChangeActivity"
             android:description="@string/description_dynamic_marker"
             android:label="@string/activity_dynamic_marker">
@@ -213,62 +202,6 @@
                 android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
-            android:name=".activity.userlocation.MyLocationTrackingModeActivity"
-            android:description="@string/description_user_location_tracking"
-            android:label="@string/activity_user_tracking_mode"
-            android:theme="@style/NoActionBar">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_userlocation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.userlocation.MyLocationDrawableActivity"
-            android:description="@string/description_user_location_customization"
-            android:label="@string/activity_user_tracking_customization">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_userlocation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.userlocation.MyLocationTintActivity"
-            android:description="@string/description_user_location_dot_color"
-            android:label="@string/activity_user_dot_color">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_userlocation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.userlocation.MyLocationToggleActivity"
-            android:description="@string/description_user_location_toggle"
-            android:label="@string/activity_user_location_toggle">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_userlocation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.userlocation.CustomLocationEngineActivity"
-            android:description="@string/description_custom_location_engine"
-            android:label="@string/activity_custom_location_engine">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_userlocation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
             android:name=".activity.annotation.PolygonActivity"
             android:description="@string/description_polygon"
             android:label="@string/activity_polygon">
@@ -412,17 +345,6 @@
                 android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
-            android:name=".activity.annotation.MarkerViewActivity"
-            android:description="@string/description_view_marker"
-            android:label="@string/activity_view_marker">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
             android:name=".activity.fragment.ViewPagerActivity"
             android:description="@string/description_viewpager"
             android:label="@string/activity_viewpager">
@@ -699,17 +621,6 @@
                 android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
-            android:name=".activity.annotation.MarkerViewsInRectangleActivity"
-            android:description="@string/description_marker_view_rectangle"
-            android:label="@string/activity_marker_view_rectangle">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
             android:name=".activity.maplayout.LatLngBoundsForCameraActivity"
             android:description="@string/description_restricted_bounds"
             android:label="@string/activity_restricted_bounds">
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
deleted file mode 100644
index e6db071141..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.annotation;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.TypeEvaluator;
-import android.animation.ValueAnimator;
-import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.animation.AccelerateDecelerateInterpolator;
-
-import com.mapbox.geojson.Point;
-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 com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
-import com.mapbox.turf.TurfMeasurement;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-/**
- * Test activity showcasing animating MarkerViews.
- */
-public class AnimatedMarkerActivity extends AppCompatActivity {
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-
-  private LatLng dupontCircle = new LatLng(38.90962, -77.04341);
-
-  private Marker passengerMarker = null;
-  private MarkerView carMarker = null;
-
-  private Runnable animationRunnable;
-
-  private List<MarkerView> markerViews = new ArrayList<>();
-  private boolean stopped;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_animated_marker);
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(mapboxMap -> {
-      AnimatedMarkerActivity.this.mapboxMap = mapboxMap;
-      setupMap();
-
-      animationRunnable = () -> {
-        for (int i = 0; i < 10; i++) {
-          addRandomCar();
-        }
-        addPassenger();
-        addMainCar();
-      };
-      mapView.post(animationRunnable);
-    });
-  }
-
-  private void setupMap() {
-    CameraPosition cameraPosition = new CameraPosition.Builder()
-      .target(dupontCircle)
-      .zoom(15)
-      .build();
-    mapboxMap.setCameraPosition(cameraPosition);
-  }
-
-  private void addPassenger() {
-    if (isActivityStopped()) {
-      return;
-    }
-
-    LatLng randomLatLng = getLatLngInBounds();
-
-    if (passengerMarker == null) {
-      Icon icon = IconUtils.drawableToIcon(this, R.drawable.ic_directions_run_black,
-        ResourcesCompat.getColor(getResources(), R.color.blueAccent, getTheme()));
-      passengerMarker = mapboxMap.addMarker(new MarkerViewOptions()
-        .position(randomLatLng)
-        .icon(icon));
-    } else {
-      passengerMarker.setPosition(randomLatLng);
-    }
-  }
-
-  private void addMainCar() {
-    if (isActivityStopped()) {
-      return;
-    }
-
-    LatLng randomLatLng = getLatLngInBounds();
-
-    if (carMarker == null) {
-      carMarker = createCarMarker(randomLatLng, R.drawable.ic_taxi_top,
-        markerView -> {
-          // Make sure the car marker is selected so that it's always brought to the front (#5285)
-          mapboxMap.selectMarker(carMarker);
-          animateMoveToPassenger(carMarker);
-        });
-      markerViews.add(carMarker);
-    } else {
-      carMarker.setPosition(randomLatLng);
-    }
-  }
-
-  private void animateMoveToPassenger(final MarkerView car) {
-    if (isActivityStopped()) {
-      return;
-    }
-
-    ValueAnimator animator = animateMoveMarker(car, passengerMarker.getPosition());
-    animator.addListener(new AnimatorListenerAdapter() {
-      @Override
-      public void onAnimationEnd(Animator animation) {
-        addPassenger();
-        animateMoveToPassenger(car);
-      }
-    });
-  }
-
-  protected void addRandomCar() {
-    markerViews.add(createCarMarker(getLatLngInBounds(), R.drawable.ic_car_top,
-      markerView -> randomlyMoveMarker(markerView)));
-  }
-
-  private void randomlyMoveMarker(final MarkerView marker) {
-    if (isActivityStopped()) {
-      return;
-    }
-
-    ValueAnimator animator = animateMoveMarker(marker, getLatLngInBounds());
-
-    // Add listener to restart animation on end
-    animator.addListener(new AnimatorListenerAdapter() {
-      @Override
-      public void onAnimationEnd(Animator animation) {
-        randomlyMoveMarker(marker);
-      }
-    });
-  }
-
-  private ValueAnimator animateMoveMarker(final MarkerView marker, LatLng to) {
-    marker.setRotation((float) getBearing(marker.getPosition(), to));
-
-    final ValueAnimator markerAnimator = ObjectAnimator.ofObject(
-      marker, "position", new LatLngEvaluator(), marker.getPosition(), to);
-    markerAnimator.setDuration((long) (10 * marker.getPosition().distanceTo(to)));
-    markerAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
-
-    // Start
-    markerAnimator.start();
-
-    return markerAnimator;
-  }
-
-  private MarkerView createCarMarker(LatLng start, @DrawableRes int carResource,
-                                     MarkerViewManager.OnMarkerViewAddedListener listener) {
-    Icon icon = IconFactory.getInstance(AnimatedMarkerActivity.this)
-      .fromResource(carResource);
-
-    // View Markers
-    return mapboxMap.addMarker(new MarkerViewOptions()
-      .position(start)
-      .icon(icon), listener);
-
-    // GL Markers
-//        return mapboxMap.addMarker(new MarkerOptions()
-//                .position(start)
-//                .icon(icon));
-
-  }
-
-  private LatLng getLatLngInBounds() {
-    LatLngBounds bounds = mapboxMap.getProjection().getVisibleRegion().latLngBounds;
-    Random generator = new Random();
-    double randomLat = bounds.getLatSouth() + generator.nextDouble()
-      * (bounds.getLatNorth() - bounds.getLatSouth());
-    double randomLon = bounds.getLonWest() + generator.nextDouble()
-      * (bounds.getLonEast() - bounds.getLonWest());
-    return new LatLng(randomLat, randomLon);
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-
-    stopped = true;
-
-    // Stop ongoing animations, prevent memory leaks
-    if (mapboxMap != null) {
-      MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
-      for (MarkerView markerView : markerViews) {
-        View view = markerViewManager.getView(markerView);
-        if (view != null) {
-          view.animate().cancel();
-        }
-      }
-    }
-
-    // onStop
-    mapView.onStop();
-    mapView.removeCallbacks(animationRunnable);
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-
-  /**
-   * Evaluator for LatLng pairs
-   */
-  private static class LatLngEvaluator implements TypeEvaluator<LatLng> {
-
-    private LatLng latLng = new LatLng();
-
-    @Override
-    public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
-      latLng.setLatitude(startValue.getLatitude()
-        + ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
-      latLng.setLongitude(startValue.getLongitude()
-        + ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
-      return latLng;
-    }
-  }
-
-  private double getBearing(LatLng from, LatLng to) {
-    return TurfMeasurement.bearing(
-      Point.fromLngLat(from.getLongitude(), from.getLatitude()),
-      Point.fromLngLat(to.getLongitude(), to.getLatitude())
-    );
-  }
-
-  private boolean isActivityStopped() {
-    return stopped;
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index afeb3b8979..2e62f18a32 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -1,11 +1,8 @@
 package com.mapbox.mapboxsdk.testapp.activity.annotation;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.app.ProgressDialog;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
@@ -14,27 +11,23 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.mapbox.mapboxsdk.annotations.Icon;
+
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
-import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil;
-import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
-import timber.log.Timber;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Random;
 
+import timber.log.Timber;
+
 /**
  * Test activity showcasing adding a large amount of Markers or MarkerViews.
  */
@@ -42,7 +35,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
 
   private MapboxMap mapboxMap;
   private MapView mapView;
-  private boolean customMarkerView;
   private List<LatLng> locations;
   private ProgressDialog progressDialog;
 
@@ -54,11 +46,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(mapboxMap -> BulkMarkerActivity.this.mapboxMap = mapboxMap);
-
-    final View fab = findViewById(R.id.fab);
-    if (fab != null) {
-      fab.setOnClickListener(new FabClickListener());
-    }
   }
 
   @Override
@@ -102,36 +89,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
       amount = locations.size();
     }
 
-    if (customMarkerView) {
-      showViewMarkers(amount);
-    } else {
-      showGlMarkers(amount);
-    }
-  }
-
-  private void showViewMarkers(int amount) {
-    DecimalFormat formatter = new DecimalFormat("#.#####");
-    Random random = new Random();
-    int randomIndex;
-
-    int color = ResourcesCompat.getColor(getResources(), R.color.redAccent, getTheme());
-    Icon icon = IconUtils.drawableToIcon(this, R.drawable.ic_droppin, color);
-
-    List<MarkerViewOptions> markerOptionsList = new ArrayList<>();
-    for (int i = 0; i < amount; i++) {
-      randomIndex = random.nextInt(locations.size());
-      LatLng latLng = locations.get(randomIndex);
-      MarkerViewOptions markerOptions = new MarkerViewOptions()
-        .position(latLng)
-        .icon(icon)
-        .title(String.valueOf(i))
-        .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude()));
-      markerOptionsList.add(markerOptions);
-    }
-    mapboxMap.addMarkerViews(markerOptionsList);
-  }
-
-  private void showGlMarkers(int amount) {
     List<MarkerOptions> markerOptionsList = new ArrayList<>();
     DecimalFormat formatter = new DecimalFormat("#.#####");
     Random random = new Random();
@@ -196,55 +153,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     mapView.onLowMemory();
   }
 
-  private class FabClickListener implements View.OnClickListener {
-
-    private TextView viewCountView;
-
-    @Override
-    public void onClick(final View view) {
-      if (mapboxMap != null) {
-        customMarkerView = true;
-
-        // remove fab
-        view.animate().alpha(0).setListener(new AnimatorListenerAdapter() {
-          @Override
-          public void onAnimationEnd(Animator animation) {
-            super.onAnimationEnd(animation);
-            view.setVisibility(View.GONE);
-          }
-        }).start();
-
-        // reload markers
-        Spinner spinner = (Spinner) findViewById(R.id.spinner);
-        if (spinner != null) {
-          int amount = Integer.valueOf(
-            getResources().getStringArray(R.array.bulk_marker_list)[spinner.getSelectedItemPosition()]);
-          showMarkers(amount);
-        }
-
-        viewCountView = (TextView) findViewById(R.id.countView);
-
-        mapView.addOnMapChangedListener(change -> {
-          if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
-            if (!mapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) {
-              viewCountView.setText(String.format(Locale.getDefault(), "ViewCache size %d",
-                mapboxMap.getMarkerViewManager().getMarkerViewContainer().getChildCount()));
-            }
-          }
-        });
-
-        mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(
-          (marker, view1, adapter) -> {
-            Toast.makeText(
-              BulkMarkerActivity.this,
-              "Hello " + marker.getId(),
-              Toast.LENGTH_SHORT).show();
-            return false;
-          });
-      }
-    }
-  }
-
   private static class LoadLocationTask extends AsyncTask<Void, Integer, List<LatLng>> {
 
     private WeakReference<BulkMarkerActivity> activity;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
deleted file mode 100644
index 8c0dd69a0c..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
+++ /dev/null
@@ -1,483 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.annotation;
-
-import android.animation.Animator;
-import android.animation.AnimatorInflater;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.FloatEvaluator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-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.MarkerViewOptions;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.model.annotations.CountryMarkerView;
-import com.mapbox.mapboxsdk.testapp.model.annotations.CountryMarkerViewOptions;
-import com.mapbox.mapboxsdk.testapp.model.annotations.TextMarkerView;
-import com.mapbox.mapboxsdk.testapp.model.annotations.TextMarkerViewOptions;
-
-import java.util.Locale;
-import java.util.Random;
-
-/**
- * Test activity showcasing multiple MarkerViews above Washington D.C.
- * <p>
- * Shows a couple of open InfoWindows out of current Viewport.
- * Updates the rotation and location of a couple of MarkerViews.
- * </p>
- */
-public class MarkerViewActivity extends AppCompatActivity {
-
-  private static final LatLng[] LAT_LNGS = new LatLng[] {
-    new LatLng(38.897424, -77.036508),
-    new LatLng(38.909698, -77.029642),
-    new LatLng(38.907227, -77.036530),
-    new LatLng(38.905607, -77.031916),
-    new LatLng(38.889441, -77.050134),
-    new LatLng(38.888000, -77.050000) // Slight overlap to show re-ordering on selection
-  };
-
-  private MapboxMap mapboxMap;
-  private MapView mapView;
-
-  // MarkerView location updates
-  private MarkerView movingMarkerOne;
-  private MarkerView movingMarkerTwo;
-  private Random randomAnimator = new Random();
-  private Handler locationUpdateHandler = new Handler();
-  private Runnable moveMarkerRunnable = new MoveMarkerRunnable();
-
-  // MarkerView rotate updates
-  private MarkerView rotateMarker;
-  private Handler rotateUpdateHandler = new Handler();
-  private Runnable rotateMarkerRunnable = new RotateMarkerRunnable();
-  private int rotation = 360;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_marker_view);
-
-    final TextView viewCountView = (TextView) findViewById(R.id.countView);
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(mapboxMap -> {
-      MarkerViewActivity.this.mapboxMap = mapboxMap;
-
-      final MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
-
-      Icon usFlag = IconFactory.getInstance(MarkerViewActivity.this)
-        .fromResource(R.drawable.ic_us);
-
-      // add default ViewMarker markers
-      for (int i = 0; i < LAT_LNGS.length; i++) {
-        MarkerViewActivity.this.mapboxMap.addMarker(new MarkerViewOptions()
-          .position(LAT_LNGS[i])
-          .title(String.valueOf(i))
-          .alpha(0.5f)
-          .icon(usFlag)
-        );
-      }
-
-      // add custom ViewMarker
-      CountryMarkerViewOptions options = new CountryMarkerViewOptions();
-      options.flagRes(R.drawable.icon_burned);
-      options.abbrevName("Mapbox");
-      options.title("Hello");
-      options.position(new LatLng(38.899774, -77.023237));
-      options.flat(true);
-      MarkerView markerView = mapboxMap.addMarker(options);
-
-      // Use object animator to rotate MarkerView
-      ValueAnimator markerAnimator = ObjectAnimator.ofObject(markerView, "rotation", new FloatEvaluator(), -90, 90);
-      markerAnimator.setDuration(5000);
-      markerAnimator.start();
-
-      MarkerViewActivity.this.mapboxMap.addMarker(new MarkerOptions()
-        .title("United States")
-        .position(new LatLng(38.902580, -77.050102))
-      );
-
-      rotateMarker = MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions()
-        .text("A")
-        .rotation(rotation = 270)
-        .position(new LatLng(38.889876, -77.008849))
-      );
-      loopMarkerRotate();
-
-
-      MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions()
-        .text("B")
-        .position(new LatLng(38.907327, -77.041293))
-      );
-
-      MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions()
-        .text("C")
-        .position(new LatLng(38.897642, -77.041980))
-      );
-
-      // if you want to customise a ViewMarker you need to extend ViewMarker and provide an adapter implementation
-      // set adapters for child classes of ViewMarker
-      markerViewManager.addMarkerViewAdapter(new CountryAdapter(MarkerViewActivity.this, mapboxMap));
-      markerViewManager.addMarkerViewAdapter(new TextAdapter(MarkerViewActivity.this, mapboxMap));
-
-      final ViewGroup markerViewContainer = markerViewManager.getMarkerViewContainer();
-
-      // add a change listener to validate the size of amount of child views
-      mapView.addOnMapChangedListener(change -> {
-        if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
-          if (!markerViewManager.getMarkerViewAdapters().isEmpty() && viewCountView != null) {
-            viewCountView.setText(String.format(
-              Locale.getDefault(),
-              getString(R.string.viewcache_size),
-              markerViewContainer.getChildCount())
-            );
-          }
-        }
-      });
-
-      // add a OnMarkerView click listener
-      MarkerViewActivity.this.mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(
-        (marker, view, adapter) -> {
-          Toast.makeText(MarkerViewActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show();
-          return false;
-        });
-
-      movingMarkerOne = MarkerViewActivity.this.mapboxMap.addMarker(new MarkerViewOptions()
-        .position(CarLocation.CAR_0_LNGS[0])
-        .icon(IconFactory.getInstance(mapView.getContext())
-          .fromResource(R.drawable.ic_android))
-      );
-
-      movingMarkerTwo = mapboxMap.addMarker(new MarkerViewOptions()
-        .position(CarLocation.CAR_1_LNGS[0])
-        .icon(IconFactory.getInstance(mapView.getContext())
-          .fromResource(R.drawable.ic_android_2))
-      );
-
-      // allow more open infowindows at the same time
-      mapboxMap.setAllowConcurrentMultipleOpenInfoWindows(true);
-
-      // add offscreen markers
-      Marker markerRightOffScreen = mapboxMap.addMarker(new MarkerOptions()
-        .setPosition(new LatLng(38.892846, -76.909399))
-        .title("InfoWindow")
-        .snippet("Offscreen, to the right of the Map."));
-
-      Marker markerRightBottomOffScreen = mapboxMap.addMarker(new MarkerOptions()
-        .setPosition(new LatLng(38.791645, -77.039006))
-        .title("InfoWindow")
-        .snippet("Offscreen, to the bottom of the Map"));
-
-      // open infowindow offscreen markers
-      mapboxMap.selectMarker(markerRightOffScreen);
-      mapboxMap.selectMarker(markerRightBottomOffScreen);
-    });
-  }
-
-  private void loopMarkerRotate() {
-    rotateUpdateHandler.postDelayed(rotateMarkerRunnable, 800);
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-    loopMarkerMove();
-  }
-
-  private void loopMarkerMove() {
-    locationUpdateHandler.postDelayed(moveMarkerRunnable, randomAnimator.nextInt(3000) + 1000);
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-    locationUpdateHandler.removeCallbacks(moveMarkerRunnable);
-    rotateUpdateHandler.removeCallbacks(rotateMarkerRunnable);
-  }
-
-  /**
-   * Updates the position of a Marker
-   */
-  private class MoveMarkerRunnable implements Runnable {
-    @Override
-    public void run() {
-      int randomInteger = randomAnimator.nextInt(9);
-      if (randomAnimator.nextInt() % 2 == 0) {
-        movingMarkerOne.setPosition(CarLocation.CAR_0_LNGS[randomInteger]);
-      } else {
-        movingMarkerTwo.setPosition(CarLocation.CAR_1_LNGS[randomInteger]);
-      }
-      loopMarkerMove();
-    }
-  }
-
-  /**
-   * Updates the rotation of a Marker
-   */
-  private class RotateMarkerRunnable implements Runnable {
-
-    private static final int ROTATION_INCREASE_VALUE = 9;
-
-    @Override
-    public void run() {
-      rotation -= ROTATION_INCREASE_VALUE;
-      if (rotation >= 0) {
-        rotation += 360;
-      }
-      rotateMarker.setRotation(rotation);
-      loopMarkerRotate();
-    }
-  }
-
-  /**
-   * Adapts a MarkerView to display an abbreviated name in a TextView and a flag in an ImageView.
-   */
-  private static class CountryAdapter extends MapboxMap.MarkerViewAdapter<CountryMarkerView> {
-
-    private LayoutInflater inflater;
-    private MapboxMap mapboxMap;
-
-    CountryAdapter(@NonNull Context context, @NonNull MapboxMap mapboxMap) {
-      super(context);
-      this.inflater = LayoutInflater.from(context);
-      this.mapboxMap = mapboxMap;
-    }
-
-    @Nullable
-    @Override
-    public View getView(@NonNull CountryMarkerView marker, @Nullable View convertView, @NonNull ViewGroup parent) {
-      ViewHolder viewHolder;
-      if (convertView == null) {
-        viewHolder = new ViewHolder();
-        convertView = inflater.inflate(R.layout.view_custom_marker, parent, false);
-        viewHolder.flag = (ImageView) convertView.findViewById(R.id.imageView);
-        viewHolder.abbrev = (TextView) convertView.findViewById(R.id.textView);
-        convertView.setTag(viewHolder);
-      } else {
-        viewHolder = (ViewHolder) convertView.getTag();
-      }
-      viewHolder.flag.setImageResource(marker.getFlagRes());
-      viewHolder.abbrev.setText(marker.getAbbrevName());
-      return convertView;
-    }
-
-    @Override
-    public boolean onSelect(
-      @NonNull final CountryMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
-      convertView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-      ObjectAnimator rotateAnimator = ObjectAnimator.ofFloat(convertView, View.ROTATION, 0, 360);
-      rotateAnimator.setDuration(reselectionForViewReuse ? 0 : 350);
-      rotateAnimator.addListener(new AnimatorListenerAdapter() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-          super.onAnimationEnd(animation);
-          convertView.setLayerType(View.LAYER_TYPE_NONE, null);
-          mapboxMap.selectMarker(marker);
-        }
-      });
-      rotateAnimator.start();
-
-      // false indicates that we are calling selectMarker after our animation ourselves
-      // true will let the system call it for you, which will result in showing an InfoWindow instantly
-      return false;
-    }
-
-    @Override
-    public void onDeselect(@NonNull CountryMarkerView marker, @NonNull final View convertView) {
-      convertView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-      ObjectAnimator rotateAnimator = ObjectAnimator.ofFloat(convertView, View.ROTATION, 360, 0);
-      rotateAnimator.addListener(new AnimatorListenerAdapter() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-          super.onAnimationEnd(animation);
-          convertView.setLayerType(View.LAYER_TYPE_NONE, null);
-        }
-      });
-      rotateAnimator.start();
-    }
-
-    private static class ViewHolder {
-      ImageView flag;
-      TextView abbrev;
-    }
-  }
-
-  /**
-   * Adapts a MarkerView to display text  in a TextView.
-   */
-  public static class TextAdapter extends MapboxMap.MarkerViewAdapter<TextMarkerView> {
-
-    private LayoutInflater inflater;
-    private MapboxMap mapboxMap;
-
-    public TextAdapter(@NonNull Context context, @NonNull MapboxMap mapboxMap) {
-      super(context);
-      this.inflater = LayoutInflater.from(context);
-      this.mapboxMap = mapboxMap;
-    }
-
-    @Nullable
-    @Override
-    public View getView(@NonNull TextMarkerView marker, @Nullable View convertView, @NonNull ViewGroup parent) {
-      ViewHolder viewHolder;
-      if (convertView == null) {
-        viewHolder = new ViewHolder();
-        convertView = inflater.inflate(R.layout.view_text_marker, parent, false);
-        viewHolder.textView = (TextView) convertView.findViewById(R.id.textView);
-        convertView.setTag(viewHolder);
-      } else {
-        viewHolder = (ViewHolder) convertView.getTag();
-      }
-      viewHolder.textView.setText(marker.getText());
-      return convertView;
-    }
-
-    @Override
-    public boolean onSelect(
-      @NonNull final TextMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
-      animateGrow(marker, convertView, 0);
-
-      // false indicates that we are calling selectMarker after our animation ourselves
-      // true will let the system call it for you, which will result in showing an InfoWindow instantly
-      return false;
-    }
-
-    @Override
-    public void onDeselect(@NonNull TextMarkerView marker, @NonNull final View convertView) {
-      animateShrink(convertView, 350);
-    }
-
-    @Override
-    public boolean prepareViewForReuse(@NonNull MarkerView marker, @NonNull View convertView) {
-      // this method is called before a view will be reused, we need to restore view state
-      // as we have scaled the view in onSelect. If not correctly applied other MarkerView will
-      // become large since these have been recycled
-
-      // cancel ongoing animation
-      convertView.animate().cancel();
-
-      if (marker.isSelected()) {
-        // shrink view to be able to be reused
-        animateShrink(convertView, 0);
-      }
-
-      // true if you want reuse to occur automatically, false if you want to manage this yourself
-      return true;
-    }
-
-    private void animateGrow(@NonNull final MarkerView marker, @NonNull final View convertView, int duration) {
-      convertView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-      Animator animator = AnimatorInflater.loadAnimator(convertView.getContext(), R.animator.scale_up);
-      animator.setDuration(duration);
-      animator.addListener(new AnimatorListenerAdapter() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-          super.onAnimationEnd(animation);
-          convertView.setLayerType(View.LAYER_TYPE_NONE, null);
-          mapboxMap.selectMarker(marker);
-        }
-      });
-      animator.setTarget(convertView);
-      animator.start();
-    }
-
-    private void animateShrink(@NonNull final View convertView, int duration) {
-      convertView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-      Animator animator = AnimatorInflater.loadAnimator(convertView.getContext(), R.animator.scale_down);
-      animator.setDuration(duration);
-      animator.addListener(new AnimatorListenerAdapter() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-          super.onAnimationEnd(animation);
-          convertView.setLayerType(View.LAYER_TYPE_NONE, null);
-        }
-      });
-      animator.setTarget(convertView);
-      animator.start();
-    }
-
-    private static class ViewHolder {
-      TextView textView;
-    }
-  }
-
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-
-  private static class CarLocation {
-
-    static LatLng[] CAR_0_LNGS = new LatLng[] {
-      new LatLng(38.92334425495122, -77.0533673443786),
-      new LatLng(38.9234737236897, -77.05389484528261),
-      new LatLng(38.9257094658146, -76.98819752280579),
-      new LatLng(38.8324328369647, -77.00690648325929),
-      new LatLng(38.87540698725855, -77.0093148713099),
-      new LatLng(38.96499498141065, -77.07707916040054),
-      new LatLng(38.90794910679896, -76.99695304153806),
-      new LatLng(38.86234025281626, -76.9950528034839),
-      new LatLng(38.862930274733635, -76.99647808241964)
-    };
-
-    static LatLng[] CAR_1_LNGS = new LatLng[] {
-      new LatLng(38.94237975070426, -76.98324549005675),
-      new LatLng(38.941520236084486, -76.98234257804742),
-      new LatLng(38.85972219720714, -76.98955808483929),
-      new LatLng(38.944289166113776, -76.98584257252891),
-      new LatLng(38.94375860578053, -76.98470344318412),
-      new LatLng(38.943167431929645, -76.98373163938666),
-      new LatLng(38.882834728904605, -77.02862535635137),
-      new LatLng(38.882869724926245, -77.02992539231113),
-      new LatLng(38.9371988177896, -76.97786740676564)
-    };
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
deleted file mode 100644
index 848eab9a3c..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.annotation;
-
-import android.graphics.RectF;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.Toast;
-
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.testapp.R;
-
-import java.util.List;
-
-import timber.log.Timber;
-
-/**
- * Test activity showcasing counting MarkerViews in a rectangle.
- */
-public class MarkerViewsInRectangleActivity extends AppCompatActivity implements OnMapReadyCallback,
-  View.OnClickListener {
-
-  public MapView mapView;
-  private MapboxMap mapboxMap;
-  private View selectionBox;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_marker_view_in_rect);
-
-    selectionBox = findViewById(R.id.selection_box);
-
-    // Initialize map as normal
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(this);
-  }
-
-  @Override
-  public void onMapReady(MapboxMap mapboxMap) {
-    MarkerViewsInRectangleActivity.this.mapboxMap = mapboxMap;
-    selectionBox.setOnClickListener(this);
-    mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(52.0907, 5.1214), 16));
-    mapboxMap.addMarker(new MarkerViewOptions().position(new LatLng(52.0907, 5.1214)));
-  }
-
-  @Override
-  public void onClick(View view) {
-    // Query
-    int top = selectionBox.getTop() - mapView.getTop();
-    int left = selectionBox.getLeft() - mapView.getLeft();
-    RectF box = new RectF(left, top, left + selectionBox.getWidth(), top + selectionBox.getHeight());
-    Timber.i("Querying box %s", box);
-    List<MarkerView> markers = mapboxMap.getMarkerViewsInRect(box);
-
-    // Show count
-    Toast.makeText(
-      MarkerViewsInRectangleActivity.this,
-      String.format("%s markers inside box", markers.size()),
-      Toast.LENGTH_SHORT).show();
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
index 9dea4f77de..55e55ce1e2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
@@ -7,8 +7,8 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import com.mapbox.mapboxsdk.annotations.InfoWindow;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
+import com.mapbox.mapboxsdk.annotations.Marker;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
@@ -50,7 +50,7 @@ public class DynamicInfoWindowAdapterActivity extends AppCompatActivity implemen
     mapboxMap.getUiSettings().setDeselectMarkersOnTap(false);
 
     // Add a marker
-    final MarkerView marker = addMarker(mapboxMap);
+    final Marker marker = addMarker(mapboxMap);
     mapboxMap.selectMarker(marker);
 
     // On map click, change the info window contents
@@ -77,9 +77,9 @@ public class DynamicInfoWindowAdapterActivity extends AppCompatActivity implemen
     mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(PARIS));
   }
 
-  private MarkerView addMarker(MapboxMap mapboxMap) {
+  private Marker addMarker(MapboxMap mapboxMap) {
     return mapboxMap.addMarker(
-      new MarkerViewOptions()
+      new MarkerOptions()
         .position(PARIS)
         .icon(IconUtils.drawableToIcon(this, R.drawable.ic_location_city,
           ResourcesCompat.getColor(getResources(), R.color.mapbox_blue, getTheme()))
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
index 3b58843e13..33aae320c7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.testapp.activity.maplayout;
 
 import android.content.Context;
-import android.location.Location;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -151,10 +150,9 @@ public class BottomSheetActivity extends AppCompatActivity {
 
     @Override
     public void onMapReady(MapboxMap mapboxMap) {
-      Location location = mapboxMap.getMyLocation();
-      if (location != null) {
-        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 15));
-      }
+      mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(
+        new LatLng(51.510790, -0.078966), 15)
+      );
     }
 
     @Override
@@ -230,10 +228,9 @@ public class BottomSheetActivity extends AppCompatActivity {
 
     @Override
     public void onMapReady(MapboxMap mapboxMap) {
-      Location location = mapboxMap.getMyLocation();
-      if (location != null) {
-        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 15));
-      }
+      mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(
+        new LatLng(52.529910, 13.402729), 15)
+      );
     }
 
     @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
index 75b2378ef7..b4dde8d2cd 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
@@ -11,11 +11,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
@@ -50,14 +48,6 @@ public class DoubleMapActivity extends AppCompatActivity {
     mapboxMap = map;
     mapboxMap.setStyleUrl(Style.DARK);
     mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(18));
-    try {
-      mapboxMap.setMyLocationEnabled(true);
-      TrackingSettings settings = mapboxMap.getTrackingSettings();
-      settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-    } catch (SecurityException securityException) {
-      // permission is handled in MainActivity
-      finish();
-    }
   }
 
   /**
@@ -106,15 +96,6 @@ public class DoubleMapActivity extends AppCompatActivity {
         uiSettings.setAttributionEnabled(false);
         uiSettings.setLogoEnabled(false);
 
-        try {
-          mapboxMap.setMyLocationEnabled(true);
-          TrackingSettings settings = mapboxMap.getTrackingSettings();
-          settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-        } catch (SecurityException securityException) {
-          // permission is handled in MainActivity
-          getActivity().finish();
-        }
-
         mapboxMap.setOnMapClickListener(point -> {
           // test if we can open 2 activities after each other
           startActivity(new Intent(mapViewMini.getContext(), DoubleMapActivity.class));
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
index 9a6079b157..49444cc7bb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
@@ -8,11 +8,9 @@ import android.view.MenuItem;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
 /**
@@ -96,24 +94,7 @@ public class MapPaddingActivity extends AppCompatActivity {
     return true;
   }
 
-  private void toggleGps(boolean enable) {
-    try {
-      // Enable user location
-      mapboxMap.setMyLocationEnabled(enable);
-
-      TrackingSettings trackingSettings = mapboxMap.getTrackingSettings();
-      trackingSettings.setDismissLocationTrackingOnGesture(false);
-      trackingSettings.setMyLocationTrackingMode(
-        enable ? MyLocationTracking.TRACKING_FOLLOW : MyLocationTracking.TRACKING_NONE);
-    } catch (SecurityException securityException) {
-      // permission not granted is handled in FeatureOverviewActivity
-      finish();
-    }
-  }
-
   private void moveToBangalore() {
-    toggleGps(false);
-
     LatLng bangalore = new LatLng(12.9810816, 77.6368034);
     CameraPosition cameraPosition = new CameraPosition.Builder()
       .zoom(16)
@@ -126,12 +107,26 @@ public class MapPaddingActivity extends AppCompatActivity {
     mapboxMap.addMarker(new MarkerOptions().title("Center map").position(bangalore));
   }
 
+
+  private void moveToBerlin() {
+    LatLng berlin = new LatLng(52.529910, 13.402729);
+    CameraPosition cameraPosition = new CameraPosition.Builder()
+      .zoom(14)
+      .target(berlin)
+      .bearing(160)
+      .tilt(20)
+      .build();
+
+    mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
+    mapboxMap.addMarker(new MarkerOptions().title("Center map").position(berlin));
+  }
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
       case R.id.action_user_tracking:
         if (mapboxMap != null) {
-          toggleGps(true);
+          moveToBerlin();
         }
         return true;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
index 066446652b..7e9b3fb7e4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
@@ -25,7 +25,7 @@ public class HillshadeLayerActivity extends AppCompatActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_fill_extrusion_layer);
+    setContentView(R.layout.activity_hillshade_layer);
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java
deleted file mode 100644
index eec26cc9a7..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
-
-import com.mapbox.android.core.permissions.PermissionsListener;
-import com.mapbox.android.core.permissions.PermissionsManager;
-
-import java.util.List;
-
-/**
- * Base class for location aware activities.
- */
-public abstract class BaseLocationActivity extends AppCompatActivity implements PermissionsListener {
-
-  private PermissionsManager permissionsManager;
-
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    permissionsManager = new PermissionsManager(this);
-  }
-
-  @UiThread
-  protected final void toggleGps(boolean enableGps) {
-    if (enableGps) {
-      if (!isRuntimePermissionsRequired()) {
-        permissionsManager.requestLocationPermissions(this);
-      } else {
-        enableLocation(true);
-      }
-    } else {
-      enableLocation(false);
-    }
-  }
-
-  @Override
-  public void onExplanationNeeded(List<String> list) {
-    Snackbar.make(
-      findViewById(android.R.id.content),
-      TextUtils.join("", list.toArray()),
-      Snackbar.LENGTH_SHORT).show();
-  }
-
-  @Override
-  public void onPermissionResult(boolean isPermissionAccepted) {
-    enableLocation(isPermissionAccepted);
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    permissionsManager.onRequestPermissionsResult(requestCode, permissions, grantResults);
-  }
-
-  private boolean isRuntimePermissionsRequired() {
-    return android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-  }
-
-  protected abstract void enableLocation(boolean enabled);
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
deleted file mode 100644
index ff2559089c..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
-
-/**
- * Test activity showcasing using a custom location engine.
- */
-public class CustomLocationEngineActivity extends BaseLocationActivity {
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-  private FloatingActionButton locationToggleFab;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_custom_location_engine);
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(map -> {
-      mapboxMap = map;
-      mapboxMap.setLocationSource(MockLocationEngine.getInstance());
-    });
-
-    locationToggleFab = (FloatingActionButton) findViewById(R.id.fabLocationToggle);
-    locationToggleFab.setOnClickListener(view -> {
-      if (mapboxMap != null) {
-        enableLocation(!mapboxMap.isMyLocationEnabled());
-      }
-    });
-  }
-
-  @Override
-  protected void enableLocation(boolean enabled) {
-    mapboxMap.setMyLocationEnabled(enabled);
-    if (enabled) {
-      locationToggleFab.setImageResource(R.drawable.ic_location_disabled);
-    } else {
-      locationToggleFab.setImageResource(R.drawable.ic_my_location);
-    }
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    getMenuInflater().inflate(R.menu.menu_location_engine, menu);
-    return super.onCreateOptionsMenu(menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    if (mapboxMap != null) {
-      int itemId = item.getItemId();
-      if (itemId == R.id.action_id_location_source_lost) {
-        mapboxMap.setLocationSource(Mapbox.getLocationEngine());
-        return true;
-      } else if (itemId == R.id.action_id_location_source_mock) {
-        mapboxMap.setLocationSource(MockLocationEngine.getInstance());
-        return true;
-      } else if (itemId == R.id.action_id_location_source_null) {
-        mapboxMap.setLocationSource(null);
-        return true;
-      }
-    }
-    return super.onOptionsItemSelected(item);
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
deleted file mode 100644
index f4fe710de1..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.animation.AnimatorListenerAdapter;
-import android.animation.TypeEvaluator;
-import android.animation.ValueAnimator;
-import android.location.Location;
-
-import com.mapbox.android.core.location.LocationEngine;
-import com.mapbox.android.core.location.LocationEngineListener;
-
-import timber.log.Timber;
-
-/**
- * Sample LocationEngine that provides mocked LOCATIONS simulating GPS updates
- */
-public class MockLocationEngine extends LocationEngine {
-  private static MockLocationEngine INSTANCE;
-
-  private final LocationAnimator locationAnimator;
-  private boolean running;
-  private static int counter;
-
-  MockLocationEngine(Location start, Location end) {
-    locationAnimator = new LocationAnimator(start, end, animation -> {
-      for (LocationEngineListener listener : locationListeners) {
-        listener.onLocationChanged((Location) animation.getAnimatedValue());
-      }
-    });
-  }
-
-  public static synchronized MockLocationEngine getInstance() {
-    if (INSTANCE == null) {
-      INSTANCE = new MockLocationEngine(
-        MockLocationEngine.createLocation(40.416913, -3.703861),
-        MockLocationEngine.createLocation(39.461643, -0.368041)
-      );
-    }
-    return INSTANCE;
-  }
-
-  public static Location createLocation(double latitude, double longitude) {
-    Location location = new Location(MockLocationEngine.class.getSimpleName());
-    location.setLatitude(latitude);
-    location.setLongitude(longitude);
-    return location;
-  }
-
-  @Override
-  public void activate() {
-    // "Connection" is immediate here
-    for (LocationEngineListener listener : locationListeners) {
-      listener.onConnected();
-    }
-  }
-
-  @Override
-  public void deactivate() {
-  }
-
-  @Override
-  public boolean isConnected() {
-    return true; // Always connected
-  }
-
-  @Override
-  public Location getLastLocation() {
-    return null;
-  }
-
-  @Override
-  public void requestLocationUpdates() {
-    if (!running) {
-      locationAnimator.start();
-      running = true;
-    }
-  }
-
-  @Override
-  public void removeLocationUpdates() {
-    if (running) {
-      locationAnimator.stop();
-      running = false;
-      Timber.e("LOC %s", counter);
-    }
-  }
-
-  @Override
-  public Type obtainType() {
-    return Type.MOCK;
-  }
-
-  private static class LocationAnimator extends AnimatorListenerAdapter {
-
-    private static final long DURATION_ANIMATION = 10000;
-    private final ValueAnimator locationAnimator;
-    private long animationTime;
-
-    LocationAnimator(Location start, Location end, ValueAnimator.AnimatorUpdateListener listener) {
-      locationAnimator = ValueAnimator.ofObject(new LocationEvaluator(), start, end);
-      locationAnimator.setDuration(DURATION_ANIMATION);
-      locationAnimator.addUpdateListener(listener);
-      locationAnimator.addListener(this);
-    }
-
-    void start() {
-      locationAnimator.start();
-      locationAnimator.setCurrentPlayTime(animationTime);
-    }
-
-    void stop() {
-      animationTime = locationAnimator.getCurrentPlayTime();
-      locationAnimator.cancel();
-    }
-
-    private static class LocationEvaluator implements TypeEvaluator<Location> {
-
-      private Location location = new Location(MockLocationEngine.class.getSimpleName());
-
-      @Override
-      public Location evaluate(float fraction, Location startValue, Location endValue) {
-        counter++;
-        location.setLatitude(startValue.getLatitude()
-          + ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
-        location.setLongitude(startValue.getLongitude()
-          + ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
-        return location;
-      }
-    }
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java
deleted file mode 100644
index f603050030..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.graphics.Color;
-import android.location.Location;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.Style;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.android.core.location.LocationEngineListener;
-
-/**
- * Test activity showcasing how to change the MyLocationView drawable.
- */
-public class MyLocationDrawableActivity extends BaseLocationActivity implements LocationEngineListener {
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_my_location_customization);
-    findViewById(R.id.progress).setVisibility(View.GONE);
-
-    MapboxMapOptions mapboxMapOptions = new MapboxMapOptions();
-    mapboxMapOptions.styleUrl(Style.MAPBOX_STREETS);
-    mapboxMapOptions.myLocationForegroundDrawable(ContextCompat.getDrawable(this, R.drawable.ic_android));
-    mapboxMapOptions.myLocationBackgroundDrawable(ContextCompat.getDrawable(this, R.drawable.ic_android));
-    mapboxMapOptions.myLocationForegroundTintColor(Color.GREEN);
-    mapboxMapOptions.myLocationBackgroundTintColor(Color.YELLOW);
-    mapboxMapOptions.myLocationBackgroundPadding(new int[] {0, 0,
-      (int) getResources().getDimension(R.dimen.locationview_background_drawable_padding),
-      (int) getResources().getDimension(R.dimen.locationview_background_drawable_padding)});
-    mapboxMapOptions.myLocationAccuracyTint(Color.RED);
-    mapboxMapOptions.myLocationAccuracyAlpha(155);
-
-    mapView = new MapView(this, mapboxMapOptions);
-    mapView.setId(R.id.mapView);
-    ViewGroup parent = (ViewGroup) findViewById(android.R.id.content);
-    parent.addView(mapView);
-
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(map -> {
-      mapboxMap = map;
-      toggleGps(true);
-    });
-  }
-
-  @Override
-  protected void enableLocation(boolean enabled) {
-    mapboxMap.setMyLocationEnabled(enabled);
-  }
-
-  @Override
-  public void onConnected() {
-    // Nothing
-  }
-
-  @Override
-  public void onLocationChanged(Location location) {
-    mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 14));
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
deleted file mode 100644
index ff3c4dfbc0..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.location.Location;
-import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.android.core.location.LocationEngineListener;
-
-/**
- * Test activity showcasing how to tint the MyLocationView.
- */
-public class MyLocationTintActivity extends BaseLocationActivity implements LocationEngineListener {
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-  private boolean firstRun;
-
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_my_location_dot_color);
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(map -> {
-      mapboxMap = map;
-
-      // enable location updates
-      toggleGps(true);
-
-      // add some padding
-      final MyLocationViewSettings myLocationViewSettings = mapboxMap.getMyLocationViewSettings();
-      myLocationViewSettings.setPadding(0, 500, 0, 0);
-
-      // enable tracking
-      TrackingSettings settings = mapboxMap.getTrackingSettings();
-      settings.setDismissLocationTrackingOnGesture(false);
-      settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-
-      // handle default button clicks
-      ViewUtils.attachClickListener(
-        MyLocationTintActivity.this,
-        R.id.default_user_dot_coloring_button,
-        view -> {
-          myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(
-            MyLocationTintActivity.this, R.color.mapbox_blue));
-          myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(
-            MyLocationTintActivity.this, R.color.mapbox_blue));
-          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-        });
-
-      // handle tint user dot button clicks
-      ViewUtils.attachClickListener(
-        MyLocationTintActivity.this,
-        R.id.tint_user_dot_button,
-        view -> {
-          myLocationViewSettings.setAccuracyTintColor(
-            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
-          myLocationViewSettings.setForegroundTintColor(
-            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
-          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-        });
-
-      // handle tint accuracy ring button clicks
-      ViewUtils.attachClickListener(
-        MyLocationTintActivity.this,
-        R.id.user_accuracy_ring_tint_button,
-        view -> {
-          myLocationViewSettings.setAccuracyTintColor(
-            ContextCompat.getColor(MyLocationTintActivity.this, R.color.accent));
-          myLocationViewSettings.setForegroundTintColor(
-            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
-          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-        });
-
-      ViewUtils.attachClickListener(
-        MyLocationTintActivity.this,
-        R.id.user_dot_transparent_button,
-        view -> {
-          myLocationViewSettings.setForegroundTintColor(Color.TRANSPARENT);
-          myLocationViewSettings.setBackgroundTintColor(Color.TRANSPARENT);
-        }
-      );
-    });
-
-  }
-
-  @Override
-  public void onConnected() {
-    // Nothing
-  }
-
-  @Override
-  public void onLocationChanged(Location location) {
-    if (mapboxMap != null && firstRun) {
-      mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 15));
-      firstRun = false;
-    }
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void enableLocation(boolean enabled) {
-    if (enabled) {
-      mapboxMap.setMyLocationEnabled(true);
-      if (mapboxMap.getMyLocation() != null) {
-        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(
-          new LatLng(mapboxMap.getMyLocation().getLatitude(),
-            mapboxMap.getMyLocation().getLongitude()), 15));
-      }
-    } else {
-      mapboxMap.setMyLocationEnabled(false);
-    }
-  }
-
-  private static class ViewUtils {
-
-    public static void attachClickListener(
-      @NonNull Activity activity, @IdRes int buttonId, @Nullable View.OnClickListener clickListener) {
-      View view = activity.findViewById(buttonId);
-      if (view != null) {
-        view.setOnClickListener(clickListener);
-      }
-    }
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
deleted file mode 100644
index ea3a6f14bc..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
-
-import timber.log.Timber;
-
-/**
- * Test activity showcasing toggling the user location on the map.
- */
-public class MyLocationToggleActivity extends BaseLocationActivity {
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-  private FloatingActionButton locationToggleFab;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_my_location_toggle);
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(map -> mapboxMap = map);
-
-    locationToggleFab = (FloatingActionButton) findViewById(R.id.fabLocationToggle);
-    locationToggleFab.setOnClickListener(view -> {
-      if (mapboxMap != null) {
-        toggleGps(!mapboxMap.isMyLocationEnabled());
-      }
-    });
-  }
-
-  @Override
-  protected void enableLocation(boolean enabled) {
-    Timber.e("Enabling location: %s", enabled);
-    mapboxMap.setMyLocationEnabled(enabled);
-    if (enabled) {
-      locationToggleFab.setImageResource(R.drawable.ic_location_disabled);
-    } else {
-      locationToggleFab.setImageResource(R.drawable.ic_my_location);
-    }
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
deleted file mode 100644
index ffbb2c1a90..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.userlocation;
-
-import android.location.Location;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-import android.widget.Toast;
-
-import com.mapbox.mapboxsdk.Mapbox;
-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.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
-import com.mapbox.mapboxsdk.maps.UiSettings;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.android.core.location.LocationEngineListener;
-
-import timber.log.Timber;
-
-/**
- * Test activity showcasing the different tracking modes the SDK exposes.
- * <p>
- * This includes MyLocationTracking/MyLocationBearingTracking and how the components can be configured to be dismissed
- * using gesture configurations.
- * </p>
- */
-public class MyLocationTrackingModeActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener,
-  OnMapReadyCallback, LocationEngineListener {
-
-  public static final int TRACKING_NONE_INDEX = 0;
-  public static final int TRACKING_FOLLOW_INDEX = 1;
-  public static final int BEARING_NONE_INDEX = 0;
-  public static final int BEARING_GPS_INDEX = 1;
-  public static final int BEARING_COMPASS_INDEX = 2;
-
-  private MapView mapView;
-  private MapboxMap mapboxMap;
-  private Spinner locationSpinner;
-  private Spinner bearingSpinner;
-  private boolean firstRun = true;
-
-  private MenuItem dismissLocationTrackingOnGestureItem;
-  private MenuItem dismissBearingTrackingOnGestureItem;
-  private MenuItem enableRotateGesturesItem;
-  private MenuItem enableScrollGesturesItem;
-
-  @Override
-  protected void onCreate(final Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_my_location_tracking);
-    setupToolbar();
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(this);
-  }
-
-  @Override
-  public void onMapReady(MapboxMap mapboxMap) {
-    MyLocationTrackingModeActivity.this.mapboxMap = mapboxMap;
-
-    mapboxMap.setMyLocationEnabled(true);
-    Mapbox.getLocationEngine().addLocationEngineListener(this);
-    Mapbox.getLocationEngine().requestLocationUpdates();
-  }
-
-  @Override
-  public void onConnected() {
-    // Nothing
-  }
-
-  @Override
-  public void onLocationChanged(Location location) {
-    Timber.e("Location changed %s", location);
-    if (firstRun) {
-      setInitialLocation(location, 16);
-    }
-  }
-
-  private void setInitialLocation(Location location, double zoom) {
-    mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), zoom));
-    mapboxMap.setMyLocationEnabled(true);
-    setupSpinners(mapboxMap);
-    firstRun = false;
-  }
-
-  private void setupToolbar() {
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-
-    final ActionBar actionBar = getSupportActionBar();
-    if (actionBar != null) {
-      actionBar.setDisplayShowTitleEnabled(false);
-      actionBar.setDisplayHomeAsUpEnabled(true);
-      actionBar.setDisplayShowHomeEnabled(true);
-
-      locationSpinner = (Spinner) findViewById(R.id.spinner_location);
-      ArrayAdapter<CharSequence> locationTrackingAdapter = ArrayAdapter.createFromResource(
-        actionBar.getThemedContext(), R.array.user_tracking_mode, android.R.layout.simple_spinner_item);
-      locationTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-      locationSpinner.setAdapter(locationTrackingAdapter);
-
-      bearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
-      ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(
-        actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
-      bearingTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-      bearingSpinner.setAdapter(bearingTrackingAdapter);
-    }
-  }
-
-  private void setupSpinners(@NonNull MapboxMap mapboxMap) {
-    locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
-    bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
-    setCheckBoxes();
-
-    mapboxMap.setOnMyLocationTrackingModeChangeListener(myLocationTrackingMode -> {
-      locationSpinner.setOnItemSelectedListener(null);
-      switch (myLocationTrackingMode) {
-        case MyLocationTracking.TRACKING_NONE:
-          locationSpinner.setSelection(TRACKING_NONE_INDEX);
-          break;
-        case MyLocationTracking.TRACKING_FOLLOW:
-          locationSpinner.setSelection(TRACKING_FOLLOW_INDEX);
-          break;
-      }
-      locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
-    });
-
-    mapboxMap.setOnMyBearingTrackingModeChangeListener(myBearingTrackingMode -> {
-      bearingSpinner.setOnItemSelectedListener(null);
-      switch (myBearingTrackingMode) {
-        case MyBearingTracking.NONE:
-          bearingSpinner.setSelection(BEARING_NONE_INDEX);
-          break;
-
-        case MyBearingTracking.GPS:
-          bearingSpinner.setSelection(BEARING_GPS_INDEX);
-          break;
-
-        case MyBearingTracking.COMPASS:
-          bearingSpinner.setSelection(BEARING_COMPASS_INDEX);
-          break;
-      }
-      bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
-    });
-  }
-
-  @Override
-  public void onItemSelected(AdapterView<?> parent, View view, int position, long id) throws SecurityException {
-    TrackingSettings trackingSettings = mapboxMap.getTrackingSettings();
-    if (parent.getId() == R.id.spinner_location) {
-      switch (position) {
-        case TRACKING_NONE_INDEX:
-          trackingSettings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
-          break;
-
-        case TRACKING_FOLLOW_INDEX:
-          trackingSettings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-          break;
-      }
-    } else if (parent.getId() == R.id.spinner_bearing) {
-      switch (position) {
-        case BEARING_NONE_INDEX:
-          trackingSettings.setMyBearingTrackingMode(MyBearingTracking.NONE);
-          break;
-
-        case BEARING_GPS_INDEX:
-          trackingSettings.setMyBearingTrackingMode(MyBearingTracking.GPS);
-          break;
-
-        case BEARING_COMPASS_INDEX:
-          trackingSettings.setMyBearingTrackingMode(MyBearingTracking.COMPASS);
-          break;
-      }
-    }
-  }
-
-  @Override
-  public void onNothingSelected(AdapterView<?> parent) {
-
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    Mapbox.getLocationEngine().removeLocationEngineListener(this);
-    Mapbox.getLocationEngine().removeLocationUpdates();
-    mapView.onStop();
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
-
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    getMenuInflater().inflate(R.menu.menu_tracking, menu);
-    dismissLocationTrackingOnGestureItem = menu.findItem(R.id.action_toggle_dismissible_location);
-    dismissBearingTrackingOnGestureItem = menu.findItem(R.id.action_toggle_dismissible_bearing);
-    enableRotateGesturesItem = menu.findItem(R.id.action_toggle_rotate_gesture_enabled);
-    enableScrollGesturesItem = menu.findItem(R.id.action_toggle_scroll_gesture_enabled);
-    setCheckBoxes();
-    return true;
-  }
-
-  private void setCheckBoxes() {
-    if (mapboxMap != null && dismissBearingTrackingOnGestureItem != null) {
-      TrackingSettings trackingSettings = mapboxMap.getTrackingSettings();
-      UiSettings uiSettings = mapboxMap.getUiSettings();
-      dismissBearingTrackingOnGestureItem.setChecked(trackingSettings.isDismissBearingTrackingOnGesture());
-      dismissLocationTrackingOnGestureItem.setChecked(trackingSettings.isDismissLocationTrackingOnGesture());
-      enableRotateGesturesItem.setChecked(uiSettings.isRotateGesturesEnabled());
-      enableScrollGesturesItem.setChecked(uiSettings.isScrollGesturesEnabled());
-    }
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    boolean state;
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-      case R.id.action_toggle_dismissible_location:
-        state = !item.isChecked();
-        mapboxMap.getTrackingSettings().setDismissLocationTrackingOnGesture(state);
-        Toast.makeText(this, "Dismiss tracking mode on gesture = " + state, Toast.LENGTH_SHORT).show();
-        item.setChecked(state);
-        return true;
-      case R.id.action_toggle_dismissible_bearing:
-        state = !item.isChecked();
-        mapboxMap.getTrackingSettings().setDismissBearingTrackingOnGesture(state);
-        Toast.makeText(this, "Dismiss bearing mode on gesture = " + state, Toast.LENGTH_SHORT).show();
-        item.setChecked(state);
-        return true;
-      case R.id.action_toggle_rotate_gesture_enabled:
-        state = !item.isChecked();
-        mapboxMap.getUiSettings().setRotateGesturesEnabled(state);
-        Toast.makeText(this, "Rotate gesture enabled = " + state, Toast.LENGTH_SHORT).show();
-        item.setChecked(state);
-        return true;
-      case R.id.action_toggle_scroll_gesture_enabled:
-        state = !item.isChecked();
-        mapboxMap.getUiSettings().setScrollGesturesEnabled(state);
-        Toast.makeText(this, "Scroll gesture enabled = " + state, Toast.LENGTH_SHORT).show();
-        item.setChecked(state);
-        return true;
-      default:
-        return super.onOptionsItemSelected(item);
-    }
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerView.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerView.java
deleted file mode 100644
index cab03e4f7a..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerView.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-
-public class CountryMarkerView extends MarkerView {
-
-  private String abbrevName;
-  private int flagRes;
-
-  public CountryMarkerView(BaseMarkerViewOptions baseMarkerViewOptions, String abbrevName, int flagRes) {
-    super(baseMarkerViewOptions);
-    this.abbrevName = abbrevName;
-    this.flagRes = flagRes;
-  }
-
-  public String getAbbrevName() {
-    return abbrevName;
-  }
-
-  public int getFlagRes() {
-    return flagRes;
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java
deleted file mode 100644
index 6602054f47..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarkerView, CountryMarkerViewOptions> {
-
-  private String abbrevName;
-  private int flagRes;
-
-  public CountryMarkerViewOptions() {
-  }
-
-  protected CountryMarkerViewOptions(Parcel in) {
-    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 = IconFactory.recreate(iconId, iconBitmap);
-      icon(icon);
-    }
-    abbrevName(in.readString());
-    flagRes(in.readInt());
-  }
-
-  @Override
-  public CountryMarkerViewOptions getThis() {
-    return this;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @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(getAlpha());
-    Icon icon = getIcon();
-    out.writeByte((byte) (icon != null ? 1 : 0));
-    if (icon != null) {
-      out.writeString(getIcon().getId());
-      out.writeParcelable(getIcon().getBitmap(), flags);
-    }
-    out.writeString(abbrevName);
-    out.writeInt(flagRes);
-  }
-
-  @Override
-  public CountryMarkerView getMarker() {
-    return new CountryMarkerView(this, abbrevName, flagRes);
-  }
-
-  public CountryMarkerViewOptions abbrevName(String abbrevName) {
-    this.abbrevName = abbrevName;
-    return getThis();
-  }
-
-  public CountryMarkerViewOptions flagRes(int flagRes) {
-    this.flagRes = flagRes;
-    return getThis();
-  }
-
-  public static final Parcelable.Creator<CountryMarkerViewOptions> CREATOR
-    = new Parcelable.Creator<CountryMarkerViewOptions>() {
-      public CountryMarkerViewOptions createFromParcel(Parcel in) {
-        return new CountryMarkerViewOptions(in);
-      }
-
-      public CountryMarkerViewOptions[] newArray(int size) {
-        return new CountryMarkerViewOptions[size];
-      }
-    };
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerView.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerView.java
deleted file mode 100644
index b01c9907e0..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerView.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-
-public class PulseMarkerView extends MarkerView {
-
-  public PulseMarkerView(BaseMarkerViewOptions baseMarkerViewOptions) {
-    super(baseMarkerViewOptions);
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerViewOptions.java
deleted file mode 100644
index d752e5d0ef..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/PulseMarkerViewOptions.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-public class PulseMarkerViewOptions extends BaseMarkerViewOptions<PulseMarkerView, PulseMarkerViewOptions> {
-
-  public PulseMarkerViewOptions() {
-  }
-
-  protected PulseMarkerViewOptions(Parcel in) {
-    position((LatLng) in.readParcelable(LatLng.class.getClassLoader()));
-    snippet(in.readString());
-    title(in.readString());
-    flat(in.readByte() != 0);
-    anchor(in.readFloat(), in.readFloat());
-    selected = in.readByte() != 0;
-    rotation(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 = IconFactory.recreate(iconId, iconBitmap);
-      icon(icon);
-    }
-  }
-
-  @Override
-  public PulseMarkerViewOptions getThis() {
-    return this;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @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.writeByte((byte) (selected ? 1 : 0));
-    out.writeFloat(getRotation());
-    Icon icon = getIcon();
-    out.writeByte((byte) (icon != null ? 1 : 0));
-    if (icon != null) {
-      out.writeString(getIcon().getId());
-      out.writeParcelable(getIcon().getBitmap(), flags);
-    }
-  }
-
-  @Override
-  public PulseMarkerView getMarker() {
-    return new PulseMarkerView(this);
-  }
-
-  public static final Parcelable.Creator<PulseMarkerViewOptions> CREATOR
-    = new Parcelable.Creator<PulseMarkerViewOptions>() {
-      public PulseMarkerViewOptions createFromParcel(Parcel in) {
-        return new PulseMarkerViewOptions(in);
-      }
-
-      public PulseMarkerViewOptions[] newArray(int size) {
-        return new PulseMarkerViewOptions[size];
-      }
-    };
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerView.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerView.java
deleted file mode 100644
index dcee5c2409..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerView.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.MarkerView;
-
-public class TextMarkerView extends MarkerView {
-
-  private String text;
-
-  public TextMarkerView(BaseMarkerViewOptions baseMarkerViewOptions, String text) {
-    super(baseMarkerViewOptions);
-    this.text = text;
-  }
-
-  public String getText() {
-    return text;
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java
deleted file mode 100644
index df7c575f74..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.model.annotations;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView, TextMarkerViewOptions> {
-
-  private String text;
-
-  public TextMarkerViewOptions() {
-  }
-
-  protected TextMarkerViewOptions(Parcel in) {
-    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 = IconFactory.recreate(iconId, iconBitmap);
-      icon(icon);
-    }
-    text(in.readString());
-  }
-
-  @Override
-  public TextMarkerViewOptions getThis() {
-    return this;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @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);
-    }
-    out.writeString(text);
-  }
-
-  @Override
-  public TextMarkerView getMarker() {
-    return new TextMarkerView(this, text);
-  }
-
-  public TextMarkerViewOptions text(String text) {
-    this.text = text;
-    return getThis();
-  }
-
-  public static final Parcelable.Creator<CountryMarkerViewOptions> CREATOR
-    = new Parcelable.Creator<CountryMarkerViewOptions>() {
-      public CountryMarkerViewOptions createFromParcel(Parcel in) {
-        return new CountryMarkerViewOptions(in);
-      }
-
-      public CountryMarkerViewOptions[] newArray(int size) {
-        return new CountryMarkerViewOptions[size];
-      }
-    };
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
deleted file mode 100644
index f450edb1fb..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:duration="300"
-        android:valueTo="1"/>
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:duration="300"
-        android:valueTo="1"/>
-</set>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
deleted file mode 100644
index f8da05f35e..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:duration="300"
-        android:valueTo="2"/>
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:duration="300"
-        android:valueTo="2"/>
-</set>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png
deleted file mode 100644
index a20277dc1b..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png
deleted file mode 100644
index d1c802c265..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
deleted file mode 100644
index c9d3f3d2d0..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png
deleted file mode 100644
index 114bb25199..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png
deleted file mode 100644
index 62867cdca4..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
deleted file mode 100644
index 235a854d71..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png
deleted file mode 100644
index e80400c4dd..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png
deleted file mode 100644
index 1b34d09842..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
deleted file mode 100644
index c9d3f3d2d0..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png
deleted file mode 100644
index 19be40bf88..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png
deleted file mode 100644
index b44cec791f..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
deleted file mode 100644
index d09e068fe9..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
deleted file mode 100644
index 8667ce6c44..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png
deleted file mode 100644
index c2c4373973..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png
deleted file mode 100644
index b735fda69f..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png
deleted file mode 100644
index 09f84fd9cb..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
deleted file mode 100644
index df0ca2e83d..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
+++ /dev/null
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml
deleted file mode 100644
index cf8bfa24b5..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml
deleted file mode 100644
index dfa43f020e..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
-</vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml
deleted file mode 100644
index a25e7884cd..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="32dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zm0,9.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
-</vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml
deleted file mode 100644
index 4fedff778b..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
-</vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
deleted file mode 100644
index 0566757d58..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:mapbox_cameraTargetLat="51.502615"
-        app:mapbox_cameraTargetLng="4.972326"
-        app:mapbox_cameraZoom="6"
-        app:mapbox_styleUrl="@string/mapbox_style_light"/>
-
-</LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_location_engine.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_location_engine.xml
deleted file mode 100644
index e9f461c7ee..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_location_engine.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@id/coordinator_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:mapbox_cameraTargetLat="40.416872"
-        app:mapbox_cameraTargetLng="-3.703807"
-        app:mapbox_cameraZoom="4"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabLocationToggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_my_location"
-        tools:backgroundTint="@color/primary"/>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
index 52691a26fe..0f60b34324 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
@@ -24,15 +24,4 @@
         android:padding="16dp"
         android:textSize="20sp"/>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_gravity="end|bottom"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_animate_coordinates"/>
-
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
deleted file mode 100644
index dae3a1d9b7..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        android:textIsSelectable="false"
-        app:mapbox_cameraTargetLat="38.907192"
-        app:mapbox_cameraTargetLng="-77.036871"
-        app:mapbox_cameraZoom="12"
-        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/>
-
-    <TextView
-        android:id="@+id/countView"
-        android:textIsSelectable="false"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:textSize="20sp"/>
-
-</RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_in_rect.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_in_rect.xml
deleted file mode 100644
index ecda2873ce..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_in_rect.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <FrameLayout
-        android:id="@+id/selection_box"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:layout_centerInParent="true"
-        android:alpha="0.3"
-        android:background="@color/mapboxGreen"/>
-
-</RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml
deleted file mode 100644
index addfe8427b..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <android.support.v4.widget.ContentLoadingProgressBar
-        android:id="@id/progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
-
-</merge>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml
deleted file mode 100644
index de18e265de..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mapbox="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        mapbox:mapbox_uiAttribution="false"
-        mapbox:mapbox_uiLogo="false"/>
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@color/accent"
-        android:orientation="horizontal"
-        android:weightSum="4">
-
-        <Button
-            android:id="@+id/default_user_dot_coloring_button"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/button_user_dot_default"
-            android:textColor="@color/white"/>
-
-        <Button
-            android:id="@+id/tint_user_dot_button"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/button_user_dot_tint"
-            android:textColor="@color/white"/>
-
-        <Button
-            android:id="@+id/user_accuracy_ring_tint_button"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/button_user_accuracy_ring_tint"
-            android:textColor="@color/white"/>
-
-        <Button
-            android:id="@+id/user_dot_transparent_button"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/button_user_transparent_tint"
-            android:textColor="@color/white"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_toggle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_toggle.xml
deleted file mode 100644
index 2ec35faf04..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_toggle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@id/coordinator_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabLocationToggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_my_location"
-        tools:backgroundTint="@color/primary"/>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
deleted file mode 100644
index 7236a944e9..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/primary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:weightSum="2">
-
-            <Spinner
-                android:id="@+id/spinner_location"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_weight="1" />
-
-            <Spinner
-                android:id="@+id/spinner_bearing"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-
-    </android.support.v7.widget.Toolbar>
-
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:mapbox_myLocationTintColor="@color/primary"
-        app:mapbox_myLocationAccuracyTintColor="@color/primary"
-        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
-        app:mapbox_cameraZoom="8" />
-
-</LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml
deleted file mode 100644
index e04a162d49..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/navigation_drawer_width"
-    android:layout_height="match_parent"
-    android:background="#cccc"
-    android:choiceMode="singleChoice"
-    android:divider="@android:color/transparent"
-    android:dividerHeight="0dp" />
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml
deleted file mode 100644
index cafa7d9746..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@id/imageView"
-        android:layout_width="64dp"
-        android:contentDescription="@null"
-        android:layout_height="64dp"/>
-
-    <TextView
-        android:id="@id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:padding="2dp"
-        android:textIsSelectable="false"
-        android:textColor="@android:color/white"
-        android:textStyle="bold"/>
-
-</RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml
deleted file mode 100644
index 1ef2c69012..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@color/mapboxGreen">
-
-    <TextView
-        android:id="@id/textView"
-        android:layout_width="wrap_content"
-        android:textColor="@android:color/white"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:padding="4dp"
-        android:textIsSelectable="false"
-        android:layout_centerInParent="true" />
-
-</RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_engine.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_engine.xml
deleted file mode 100644
index dd7408df09..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_engine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:mapbox="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_id_location_source_lost"
-        android:title="@string/menuitem_title_change_location_source_lost"
-        mapbox:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_id_location_source_mock"
-        android:title="@string/menuitem_title_change_location_source_mock"
-        mapbox:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_id_location_source_null"
-        android:title="@string/menuitem_title_change_location_source_null"
-        mapbox:showAsAction="never"/>
-
-</menu>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml
deleted file mode 100644
index 940dd9c461..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <group android:checkableBehavior="all">
-        <item
-            android:id="@+id/action_toggle_dismissible_location"
-            android:checkable="true"
-            android:checked="false"
-            android:title="@string/menuitem_title_tracking_mode_dismiss_on_gesture"
-            app:showAsAction="never" />
-        <item
-            android:id="@+id/action_toggle_dismissible_bearing"
-            android:checkable="true"
-            android:checked="false"
-            android:title="@string/menuitem_title_bearing_mode_dismiss_on_gesture"
-            app:showAsAction="never" />
-        <item
-            android:id="@+id/action_toggle_rotate_gesture_enabled"
-            android:checkable="true"
-            android:checked="false"
-            android:title="@string/menuitem_title_rotate_gesture_enabled"
-            app:showAsAction="never" />
-        <item
-            android:id="@+id/action_toggle_scroll_gesture_enabled"
-            android:checkable="true"
-            android:checked="false"
-            android:title="@string/menuitem_title_scroll_gesture_enabled"
-            app:showAsAction="never" />
-    </group>
-
-</menu>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
index ab690c664c..ae614f8ec6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="AppBaseTheme">
-
-    </style>
-
-    <style name="AppTheme.ActionBar.Transparent" parent="NoActionBar">
-        <item name="colorPrimary">@android:color/transparent</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-    <style name="AppTheme.ActionBar" parent="AppTheme">
-        <item name="colorPrimaryDark">@color/primaryDark</item>
-        <item name="colorPrimary">@color/primary</item>
-    </style>
+    <style name="AppTheme" parent="AppBaseTheme"/>
 
 </resources>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
index e7d140d7d4..ba41865ffe 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
@@ -2,14 +2,7 @@
 <resources>
     <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
     <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>
-    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
-    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
     <string name="menuitem_title_reset">Reset</string>
-    <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
-    <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
-    <string name="menuitem_title_change_location_source_lost">Change to LOST location source</string>
-    <string name="menuitem_title_change_location_source_mock">Change to mock location source</string>
-    <string name="menuitem_title_change_location_source_null">Reset location source to null</string>
     <string name="menuitem_change_icon_overlap">Toggle icon overlap</string>
     <string name="menuitem_filter">Filter layer</string>
     <string name="menuitem_change_location">Change location</string>
@@ -21,10 +14,6 @@
     <string name="button_camera_move">Move</string>
     <string name="button_camera_ease">Ease</string>
     <string name="button_camera_animate">Animate</string>
-    <string name="button_user_dot_default">Default</string>
-    <string name="button_user_dot_tint">Tint dot</string>
-    <string name="button_user_accuracy_ring_tint">Tint ring</string>
-    <string name="button_user_transparent_tint">tran</string>
     <string name="button_open_dialog">Open dialog</string>
     <string name="button_download_region">Download region</string>
     <string name="button_list_regions">List regions</string>
@@ -47,7 +36,6 @@
     <string name="dynamic_marker_arsenal_title">Arsenal</string>
     <string name="dynamic_marker_arsenal_snippet">Emirates Stadium</string>
     <string name="debug_zoom">Zoom: %.2f</string>
-    <string name="viewcache_size">ViewCache size %.2f</string>
     <string name="latitude">Latitude</string>
     <string name="min_value">-180</string>
     <string name="longitude">Longitude</string>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
index 94763342d2..4b7ded8e3a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
@@ -7,16 +7,4 @@
         <item>1000</item>
         <item>10000</item>
     </string-array>
-
-    <string-array name="user_tracking_mode">
-        <item>Disabled</item>
-        <item>Follow tracking</item>
-    </string-array>
-
-    <string-array name="user_bearing_mode">
-        <item>Disabled</item>
-        <item>GPS bearing</item>
-        <item>Compass bearing</item>
-        <!--<item>Combined mode</item>-->
-    </string-array>
 </resources>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
index 51182f958c..fcb2ec00db 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="description_user_location_tracking">Tracks the location of the user</string>
-    <string name="description_user_location_customization">Customize the location of the user</string>
-    <string name="description_user_location_dot_color">Customize the user location color</string>
-    <string name="description_user_location_toggle">Toggle location of the user on and off</string>
-    <string name="description_custom_location_engine">Customize location engine</string>
     <string name="description_custom_layer">Overlay a custom native layer on the map</string>
     <string name="description_info_window_adapter">Learn how to create a custom InfoWindow</string>
     <string name="description_cameraposition">CameraPosition capabilities</string>
@@ -24,13 +19,11 @@
     <string name="description_offline">Offline Map example</string>
     <string name="description_update_metadata">Update metadata example</string>
     <string name="description_offline_region_delete">Delete region example</string>
-    <string name="description_animated_marker">Animate the position change of a marker</string>
     <string name="description_polyline">Add a polyline to a map</string>
     <string name="description_polygon">Add a polygon to a map</string>
     <string name="description_scroll_by">Scroll with pixels in x,y direction</string>
     <string name="description_snapshot">Example to make a snapshot of the map</string>
     <string name="description_doublemap">2 maps in a view hierarchy</string>
-    <string name="description_view_marker">Use an Android SDK View as marker</string>
     <string name="description_dynamic_info_window_adapter">Learn how to create a dynamic custom InfoWindow</string>
     <string name="description_viewpager">Use SupportMapFragments in a ViewPager</string>
     <string name="description_runtime_style">Adopt the map style on the fly</string>
@@ -51,7 +44,6 @@
     <string name="description_add_remove_markers">Change Symbol icon when zoom levels changes</string>
     <string name="description_style_file">Use a local file as the style</string>
     <string name="description_map_in_dialog">Display a map inside a dialog fragment</string>
-    <string name="description_marker_view_rectangle">Marker Views within a rectangle</string>
     <string name="description_circle_layer">Show bus stops and route in Singapore</string>
     <string name="description_url_transform">Transform urls on the fly</string>
     <string name="description_restricted_bounds">Limit viewport to Iceland</string>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
index 0a43af09de..4dcad1e6f2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
@@ -6,6 +6,4 @@
     <dimen name="map_padding_bottom">256dp</dimen>
     <dimen name="map_padding_right">32dp</dimen>
     <dimen name="map_padding_top">0dp</dimen>
-    <dimen name="locationview_background_drawable_padding">2dp</dimen>
-    <dimen name="navigation_drawer_width">240dp</dimen>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
index 777d8a5f56..01759aea14 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
@@ -17,16 +17,6 @@
         <item name="android:windowBackground">@color/white</item>
     </style>
 
-    <style name="AppTheme.ActionBar.Transparent" parent="NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="windowActionBarOverlay">true</item>
-        <item name="colorPrimary">@android:color/transparent</item>
-    </style>
-
-    <style name="AppTheme.ActionBar" parent="AppTheme">
-        <item name="windowActionBarOverlay">false</item>
-    </style>
-
     <style name="MySpinnerStyle">
         <item name="android:popupBackground">@android:color/background_light</item>
         <item name="android:textColor">@android:color/background_light</item>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
index 078ccb64a9..aff8d6db78 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
@@ -4,12 +4,10 @@
     <string name="activity_map_fragment">Map Fragment</string>
     <string name="activity_multimap">Multiple Maps on Screen</string>
     <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
-    <string name="activity_animated_marker">Animated Markers</string>
     <string name="activity_dynamic_marker">Dynamic Marker</string>
     <string name="activity_polyline">Polyline</string>
     <string name="activity_polygon">Polygon</string>
     <string name="activity_press_for_marker">Press Map For Marker</string>
-    <string name="activity_view_marker">View Marker API</string>
     <string name="activity_add_remove_markers">Zoom function with SymbolLayer</string>
     <string name="activity_info_window">Standard InfoWindow</string>
     <string name="activity_infowindow_adapter">Custom InfoWindow</string>
@@ -21,11 +19,6 @@
     <string name="activity_scroll_by">Scroll By Method</string>
     <string name="activity_double_map">Double Map Activity</string>
     <string name="activity_snapshot">Snapshot Activity</string>
-    <string name="activity_user_tracking_mode">User tracking mode</string>
-    <string name="activity_user_tracking_customization">User location drawable</string>
-    <string name="activity_user_dot_color">User location tint color</string>
-    <string name="activity_user_location_toggle">User location toggle</string>
-    <string name="activity_custom_location_engine">Custom location engine</string>
     <string name="activity_custom_layer">Custom Layer</string>
     <string name="activity_map_padding">Map Padding</string>
     <string name="activity_debug_mode">Debug Mode</string>
@@ -52,7 +45,6 @@
     <string name="activity_map_change">Map Change Events</string>
     <string name="activity_map_visibility">Visibility Map</string>
     <string name="activity_map_in_dialog">Dialog with map</string>
-    <string name="activity_marker_view_rectangle">Marker views in rectangle</string>
     <string name="activity_url_transform">Url transform</string>
     <string name="activity_restricted_bounds">Restrict camera to a bounds</string>
     <string name="activity_fill_extrusion_layer">Fill extrusions</string>