1 files changed, 24 insertions, 14 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PressForMarkerActivity.java
index 5aa7423fb3..fd82fb0eb7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PressForMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PressForMarkerActivity.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.testapp.activity;
 
 import android.graphics.PointF;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -14,6 +15,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.ApiAccess;
@@ -21,6 +23,7 @@ import com.mapbox.mapboxsdk.maps.MapView;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.List;
 
 public class PressForMarkerActivity extends AppCompatActivity implements MapboxMap.OnMapLongClickListener {
 
@@ -29,7 +32,7 @@ public class PressForMarkerActivity extends AppCompatActivity implements MapboxM
 
     private MapView mMapView;
     private MapboxMap mMapboxMap;
-    private ArrayList<MarkerOptions> mMarkerList;
+    private List<MarkerOptions> mMarkerList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -45,30 +48,37 @@ public class PressForMarkerActivity extends AppCompatActivity implements MapboxM
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        // Adding MapView programmatically
-        mMapView = new MapView(this);
-        mMapView.setAccessToken(ApiAccess.getToken(this));
-        mMapView.setStyle(Style.EMERALD);
-        mMapView.onCreate(savedInstanceState);
+        // Initial MapboxMap configuration
+        MapboxMapOptions options = new MapboxMapOptions();
+        options.accessToken(getString(R.string.mapbox_access_token));
+        options.styleUrl(Style.EMERALD);
+        options.camera(new CameraPosition.Builder()
+                .target(new LatLng(45.1855569, 5.7215506))
+                .zoom(11)
+                .build());
+
+        // Create MapView programmatically
+        mMapView = new MapView(this, options);
+
+        // Add MapView to ViewGroup
         ((ViewGroup) findViewById(R.id.activity_container)).addView(mMapView);
 
+        // Lifecycle method
+        mMapView.onCreate(savedInstanceState);
+
+        // Handle saved state
         if (savedInstanceState != null) {
             mMarkerList = savedInstanceState.getParcelableArrayList(STATE_MARKER_LIST);
-        }else{
+        } else {
             mMarkerList = new ArrayList<>();
         }
 
+        // Get MapboxMap
         mMapView.getMapAsync(new OnMapReadyCallback() {
             @Override
             public void onMapReady(@NonNull MapboxMap mapboxMap) {
                 mMapboxMap = mapboxMap;
 
-                // set camera
-                mapboxMap.setCameraPosition(new CameraPosition.Builder()
-                        .target(new LatLng(45.1855569, 5.7215506))
-                        .zoom(11)
-                        .build());
-
                 // add markers
                 mapboxMap.addMarkers(mMarkerList);
 
@@ -115,7 +125,7 @@ public class PressForMarkerActivity extends AppCompatActivity implements MapboxM
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         mMapView.onSaveInstanceState(outState);
-        outState.putParcelableArrayList(STATE_MARKER_LIST, mMarkerList);
+        outState.putParcelableArrayList(STATE_MARKER_LIST, (ArrayList<MarkerOptions>) mMarkerList);
     }
 
     @Override