1 files changed, 37 insertions, 43 deletions

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 7ec9cb9242..75b2378ef7 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
@@ -3,26 +3,28 @@ package com.mapbox.mapboxsdk.testapp.activity.maplayout;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
-import android.view.SurfaceView;
 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.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;
 
+/**
+ * Test activity showcasing having 2 maps on top of each other.
+ * <p>
+ * The small map is using the `mapbox_enableZMediaOverlay="true"` configuration
+ * </p>
+ */
 public class DoubleMapActivity extends AppCompatActivity {
 
   private static final String TAG_FRAGMENT = "map";
@@ -45,11 +47,11 @@ public class DoubleMapActivity extends AppCompatActivity {
   public void setMapboxMap(MapboxMap map) {
     // we need to set mapboxmap on the parent activity,
     // for auto-generated ui tests
-
     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) {
@@ -58,6 +60,9 @@ public class DoubleMapActivity extends AppCompatActivity {
     }
   }
 
+  /**
+   * Custom fragment containing 2 MapViews.
+   */
   public static class DoubleMapFragment extends Fragment {
 
     private DoubleMapActivity activity;
@@ -82,50 +87,39 @@ public class DoubleMapActivity extends AppCompatActivity {
       // MapView large
       mapView = (MapView) view.findViewById(R.id.mapView);
       mapView.onCreate(savedInstanceState);
-      mapView.getMapAsync(new OnMapReadyCallback() {
-        @Override
-        public void onMapReady(@NonNull MapboxMap mapboxMap) {
-          if (activity != null) {
-            activity.setMapboxMap(mapboxMap);
-          }
+      mapView.getMapAsync(mapboxMap -> {
+        if (activity != null) {
+          activity.setMapboxMap(mapboxMap);
         }
       });
 
       // MapView mini
       mapViewMini = (MapView) view.findViewById(R.id.mini_map);
       mapViewMini.onCreate(savedInstanceState);
-      mapViewMini.getMapAsync(new OnMapReadyCallback() {
-        @Override
-        public void onMapReady(@NonNull MapboxMap mapboxMap) {
-          mapboxMap.setStyleUrl(Style.LIGHT);
-          mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(4));
-
-          UiSettings uiSettings = mapboxMap.getUiSettings();
-          uiSettings.setAllGesturesEnabled(false);
-          uiSettings.setCompassEnabled(false);
-          uiSettings.setAttributionEnabled(false);
-          uiSettings.setLogoEnabled(false);
-
-          try {
-            TrackingSettings settings = mapboxMap.getTrackingSettings();
-            settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-          } catch (SecurityException securityException) {
-            // permission is handled in MainActivity
-            getActivity().finish();
-          }
-
-          mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
-            @Override
-            public void onMapClick(@NonNull LatLng point) {
-              // test if we can open 2 activities after each other
-              startActivity(new Intent(mapViewMini.getContext(), DoubleMapActivity.class));
-            }
-          });
+      mapViewMini.getMapAsync(mapboxMap -> {
+        mapboxMap.setStyleUrl(Style.LIGHT);
+        mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(4));
+
+        UiSettings uiSettings = mapboxMap.getUiSettings();
+        uiSettings.setAllGesturesEnabled(false);
+        uiSettings.setCompassEnabled(false);
+        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();
         }
-      });
 
-      SurfaceView surfaceViewMini = (SurfaceView) mapViewMini.findViewById(R.id.surfaceView);
-      surfaceViewMini.setZOrderMediaOverlay(true);
+        mapboxMap.setOnMapClickListener(point -> {
+          // test if we can open 2 activities after each other
+          startActivity(new Intent(mapViewMini.getContext(), DoubleMapActivity.class));
+        });
+      });
     }
 
     @Override
@@ -157,8 +151,8 @@ public class DoubleMapActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onDestroy() {
-      super.onDestroy();
+    public void onDestroyView() {
+      super.onDestroyView();
       mapView.onDestroy();
       mapViewMini.onDestroy();
     }