1 files changed, 36 insertions, 19 deletions

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
index 660404f144..ff2559089c 100644
--- 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
@@ -2,46 +2,39 @@ package com.mapbox.mapboxsdk.testapp.activity.userlocation;
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.view.View;
+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.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
 
+/**
+ * Test activity showcasing using a custom location engine.
+ */
 public class CustomLocationEngineActivity extends BaseLocationActivity {
 
   private MapView mapView;
   private MapboxMap mapboxMap;
   private FloatingActionButton locationToggleFab;
 
-  private LocationEngine locationServices;
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_custom_location_engine);
 
-    locationServices = new MockLocationEngine();
-
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap map) {
-        mapboxMap = map;
-        mapboxMap.setLocationSource(locationServices);
-      }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+      mapboxMap.setLocationSource(MockLocationEngine.getInstance());
     });
 
     locationToggleFab = (FloatingActionButton) findViewById(R.id.fabLocationToggle);
-    locationToggleFab.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        if (mapboxMap != null) {
-          toggleGps(!mapboxMap.isMyLocationEnabled());
-        }
+    locationToggleFab.setOnClickListener(view -> {
+      if (mapboxMap != null) {
+        enableLocation(!mapboxMap.isMyLocationEnabled());
       }
     });
   }
@@ -57,6 +50,30 @@ public class CustomLocationEngineActivity extends BaseLocationActivity {
   }
 
   @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();