1 files changed, 27 insertions, 21 deletions
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
index 5560f81fa9..8657434127 100644
--- 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
@@ -11,33 +11,35 @@ 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.location.LocationSource;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
+
+import com.mapzen.android.lost.api.LocationListener;
+import com.mapzen.android.lost.api.LocationRequest;
+import com.mapzen.android.lost.api.LocationServices;
+import com.mapzen.android.lost.api.LostApiClient;
 
 /**
  * Test activity showcasing how to change the MyLocationView drawable.
  */
-public class MyLocationDrawableActivity extends BaseLocationActivity implements LocationEngineListener {
+public class MyLocationDrawableActivity extends BaseLocationActivity implements LostApiClient.ConnectionCallbacks,
+  LocationListener {
 
   private MapView mapView;
   private MapboxMap mapboxMap;
+  private LostApiClient lostApiClient;
 
   @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);
-
-    // configure MyLocationView drawables
     mapboxMapOptions.myLocationForegroundDrawable(ContextCompat.getDrawable(this, R.drawable.ic_android));
     mapboxMapOptions.myLocationBackgroundDrawable(ContextCompat.getDrawable(this, R.drawable.ic_android));
     mapboxMapOptions.myLocationForegroundTintColor(Color.GREEN);
@@ -45,7 +47,6 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
     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);
 
@@ -66,29 +67,29 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
 
   @Override
   protected void enableLocation(boolean enabled) {
-    if (enabled) {
-      mapboxMap.setMyLocationEnabled(true);
-      Location location = mapboxMap.getMyLocation();
-      if (location != null) {
-        onLocationChanged(location);
-      } else {
-        LocationSource.getLocationEngine(this).addLocationEngineListener(this);
-      }
-    } else {
-      mapboxMap.setMyLocationEnabled(false);
+    mapboxMap.setMyLocationEnabled(enabled);
+    if (lostApiClient == null) {
+      lostApiClient = new LostApiClient.Builder(this).addConnectionCallbacks(this).build();
+      lostApiClient.connect();
     }
   }
 
   @Override
   public void onConnected() {
-    // Nothing
+    LocationRequest request = LocationRequest.create()
+      .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+      .setInterval(5000)
+      .setSmallestDisplacement(10);
+    LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
   }
 
   @Override
   public void onLocationChanged(Location location) {
-    if (mapboxMap != null) {
-      mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 14));
-    }
+    mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location), 14));
+  }
+
+  @Override
+  public void onConnectionSuspended() {
   }
 
   @Override
@@ -113,6 +114,11 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
   protected void onStop() {
     super.onStop();
     mapView.onStop();
+    if (lostApiClient.isConnected()) {
+      LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
+      lostApiClient.disconnect();
+    }
+    lostApiClient.unregisterConnectionCallbacks(this);
   }
 
   @Override