5859 generate sanity tests (#5870)

* [android] #5859 - generate espresso tests

[android] #5859 - cleanup xml files, use all the same resource id for map view

[android] #5859 - update scripts

[android] #5859 - update Activity to match mapboxMap naming

[android] #5859 - make SurfaceViewMediaControlActivity compatible

[android] #5859 - make MarkerViewScaleActivity test generation compatible

[android] #5859 - make PolygonActivity test generation compatible

[android] #5859 - integration within make file

[android] #5859 - made CameraPostion generation safe

[android] #5859 - generate sanity test

[android] #5859 - add generated test cases

[android] #5859 - add documentation

* [android] #5859 - remove generated files, introduce gen package, added gitignore to package

* [android] #5859 - regenerated test code

* [android] #5859 - added AWS gradle plugin + bitrise configuration

* [android] #5859 - fixes running locally without having the properties configured

* [android] #6010 - remove python from android sdk

* [android] #5859 - update docs about aws gradle plugin

6 files changed, 213 insertions, 198 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
index 44758cd146..6494fff9f5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.testapp.activity.camera;
 
 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;
@@ -10,24 +9,24 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
+import com.mapbox.mapboxsdk.constants.MapboxConstants;
 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 com.mapbox.mapboxsdk.maps.MapView;
 
-public class CameraAnimationTypeActivity extends AppCompatActivity {
+public class CameraAnimationTypeActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     private static final String TAG = "CameraActivity";
+    private static final LatLng LAT_LNG_LONDON_EYE = new LatLng(51.50325, -0.11968);
+    private static final LatLng LAT_LNG_TOWER_BRIDGE = new LatLng(51.50550, -0.07520);
 
+    private MapboxMap mapboxMap;
     private MapView mapView;
-
     private boolean cameraState;
-    private static final LatLng LAT_LNG_LONDON_EYE = new LatLng(51.50325, -0.11968);
-    private static final LatLng LAT_LNG_TOWER_BRIDGE = new LatLng(51.50550, -0.07520);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,92 +43,103 @@ public class CameraAnimationTypeActivity extends AppCompatActivity {
         }
 
         mapView = (MapView) findViewById(R.id.mapView);
-        mapView.onCreate(savedInstanceState);
-        mapView.getMapAsync(new OnMapReadyCallback() {
+        if (mapView != null) {
+            mapView.onCreate(savedInstanceState);
+            mapView.getMapAsync(this);
+        }
+    }
+
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        mapboxMap.getUiSettings().setAttributionEnabled(false);
+        mapboxMap.getUiSettings().setLogoEnabled(false);
+        mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
             @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                mapboxMap.getUiSettings().setAttributionEnabled(false);
-                mapboxMap.getUiSettings().setLogoEnabled(false);
-                mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
-                    @Override
-                    public void onCameraChange(CameraPosition position) {
-                        Log.v(MapboxConstants.TAG, position.toString());
-                    }
-                });
-
-                // handle move button clicks
-                findViewById(R.id.cameraMoveButton).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        CameraPosition cameraPosition = new CameraPosition.Builder()
-                                .target(getNextLatLng())
-                                .zoom(14)
-                                .tilt(30)
-                                .tilt(0)
-                                .build();
-
-                        mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
-                    }
-                });
-
-                // handle ease button clicks
-                findViewById(R.id.cameraEaseButton).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        CameraPosition cameraPosition = new CameraPosition.Builder()
-                                .target(getNextLatLng())
-                                .zoom(15)
-                                .bearing(180)
-                                .tilt(30)
-                                .build();
-
-                        MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
-                            @Override
-                            public void onCancel() {
-                                Log.i(TAG, "Duration onCancel Callback called.");
-                                Toast.makeText(CameraAnimationTypeActivity.this, "Ease onCancel Callback called.", Toast.LENGTH_LONG).show();
-                            }
-
-                            @Override
-                            public void onFinish() {
-                                Log.i(TAG, "Duration onFinish Callback called.");
-                                Toast.makeText(CameraAnimationTypeActivity.this, "Ease onFinish Callback called.", Toast.LENGTH_LONG).show();
-                            }
-                        };
-
-                        mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 7500, callback);
-                    }
-                });
-
-                // handle animate button clicks
-                findViewById(R.id.cameraAnimateButton).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        CameraPosition cameraPosition = new CameraPosition.Builder()
-                                .target(getNextLatLng())
-                                .bearing(270)
-                                .tilt(20)
-                                .build();
-
-                        MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
-                            @Override
-                            public void onCancel() {
-                                Log.i(TAG, "Duration onCancel Callback called.");
-                                Toast.makeText(CameraAnimationTypeActivity.this, "Duration onCancel Callback called.", Toast.LENGTH_LONG).show();
-                            }
-
-                            @Override
-                            public void onFinish() {
-                                Log.i(TAG, "Duration onFinish Callback called.");
-                                Toast.makeText(CameraAnimationTypeActivity.this, "Duration onFinish Callback called.", Toast.LENGTH_LONG).show();
-                            }
-                        };
-
-                        mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 7500, callback);
-                    }
-                });
+            public void onCameraChange(CameraPosition position) {
+                Log.v(MapboxConstants.TAG, position.toString());
             }
         });
+
+        // handle move button clicks
+        View moveButton = findViewById(R.id.cameraMoveButton);
+        if (moveButton != null) {
+            moveButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    CameraPosition cameraPosition = new CameraPosition.Builder()
+                            .target(getNextLatLng())
+                            .zoom(14)
+                            .tilt(30)
+                            .tilt(0)
+                            .build();
+                    mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
+                }
+            });
+        }
+
+        // handle ease button clicks
+        View easeButton = findViewById(R.id.cameraEaseButton);
+        if (easeButton != null) {
+            easeButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    CameraPosition cameraPosition = new CameraPosition.Builder()
+                            .target(getNextLatLng())
+                            .zoom(15)
+                            .bearing(180)
+                            .tilt(30)
+                            .build();
+
+                    MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
+                        @Override
+                        public void onCancel() {
+                            Log.i(TAG, "Duration onCancel Callback called.");
+                            Toast.makeText(CameraAnimationTypeActivity.this, "Ease onCancel Callback called.", Toast.LENGTH_LONG).show();
+                        }
+
+                        @Override
+                        public void onFinish() {
+                            Log.i(TAG, "Duration onFinish Callback called.");
+                            Toast.makeText(CameraAnimationTypeActivity.this, "Ease onFinish Callback called.", Toast.LENGTH_LONG).show();
+                        }
+                    };
+
+                    mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 7500, callback);
+                }
+            });
+        }
+
+        // handle animate button clicks
+        View animateButton = findViewById(R.id.cameraAnimateButton);
+        if (animateButton != null) {
+            animateButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    CameraPosition cameraPosition = new CameraPosition.Builder()
+                            .target(getNextLatLng())
+                            .bearing(270)
+                            .tilt(20)
+                            .build();
+
+                    MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
+                        @Override
+                        public void onCancel() {
+                            Log.i(TAG, "Duration onCancel Callback called.");
+                            Toast.makeText(CameraAnimationTypeActivity.this, "Duration onCancel Callback called.", Toast.LENGTH_LONG).show();
+                        }
+
+                        @Override
+                        public void onFinish() {
+                            Log.i(TAG, "Duration onFinish Callback called.");
+                            Toast.makeText(CameraAnimationTypeActivity.this, "Duration onFinish Callback called.", Toast.LENGTH_LONG).show();
+                        }
+                    };
+
+                    mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 7500, callback);
+                }
+            });
+        }
     }
 
     private LatLng getNextLatLng() {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
index 220bef197b..3f4763ba48 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
@@ -30,6 +30,7 @@ import com.mapbox.mapboxsdk.testapp.R;
 public class CameraPositionActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     private MapView mapView;
+    private MapboxMap mapboxMap;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +53,7 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe
 
     @Override
     public void onMapReady(@NonNull final MapboxMap mapboxMap) {
+        this.mapboxMap = mapboxMap;
         // add a listener to FAB
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setColorFilter(ContextCompat.getColor(CameraPositionActivity.this, R.color.primary));
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
index 3ab8f7e763..311991d0d1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.testapp.activity.camera;
 
 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;
@@ -23,12 +22,13 @@ import com.mapbox.mapboxsdk.testapp.R;
 import java.util.ArrayList;
 import java.util.List;
 
-public class LatLngBoundsActivity extends AppCompatActivity {
+public class LatLngBoundsActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     private static final LatLng LOS_ANGELES = new LatLng(34.053940, -118.242622);
     private static final LatLng NEW_YORK = new LatLng(40.712730, -74.005953);
 
-    private MapView mMapView;
+    private MapView mapView;
+    private MapboxMap mapboxMap;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,77 +44,78 @@ public class LatLngBoundsActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.setStyleUrl(Style.DARK);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
-            @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-
-                UiSettings uiSettings = mapboxMap.getUiSettings();
-                uiSettings.setAllGesturesEnabled(false);
-
-                mapboxMap.addMarker(new MarkerOptions()
-                        .title("Los Angeles")
-                        .snippet("City Hall")
-                        .position(LOS_ANGELES));
-
-                mapboxMap.addMarker(new MarkerOptions()
-                        .title("New York")
-                        .snippet("City Hall")
-                        .position(NEW_YORK));
-
-                List<LatLng> points = new ArrayList<>();
-                points.add(NEW_YORK);
-                points.add(LOS_ANGELES);
-
-                // Create Bounds
-                final LatLngBounds bounds = new LatLngBounds.Builder()
-                        .includes(points)
-                        .build();
-
-                // Add map padding
-                int mapPadding = (int) getResources().getDimension(R.dimen.fab_margin);
-                mapboxMap.setPadding(mapPadding, mapPadding, mapPadding, mapPadding);
-
-                // Move camera to the bounds with added padding
-                int padding = (int) getResources().getDimension(R.dimen.coordinatebounds_margin);
-                mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, padding));
-
-                // Call mapboxMap.getProjection().getVisibleRegion().latLngBounds to retrieve the bounds
-                Log.v(MapboxConstants.TAG, mapboxMap.getProjection().getVisibleRegion().latLngBounds.toString());
-            }
-        });
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.setStyleUrl(Style.DARK);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(this);
+    }
+
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        UiSettings uiSettings = mapboxMap.getUiSettings();
+        uiSettings.setAllGesturesEnabled(false);
+
+        mapboxMap.addMarker(new MarkerOptions()
+                .title("Los Angeles")
+                .snippet("City Hall")
+                .position(LOS_ANGELES));
+
+        mapboxMap.addMarker(new MarkerOptions()
+                .title("New York")
+                .snippet("City Hall")
+                .position(NEW_YORK));
+
+        List<LatLng> points = new ArrayList<>();
+        points.add(NEW_YORK);
+        points.add(LOS_ANGELES);
+
+        // Create Bounds
+        final LatLngBounds bounds = new LatLngBounds.Builder()
+                .includes(points)
+                .build();
+
+        // Add map padding
+        int mapPadding = (int) getResources().getDimension(R.dimen.fab_margin);
+        mapboxMap.setPadding(mapPadding, mapPadding, mapPadding, mapPadding);
+
+        // Move camera to the bounds with added padding
+        int padding = (int) getResources().getDimension(R.dimen.coordinatebounds_margin);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, padding));
+
+        // Log data
+        Log.e(MapboxConstants.TAG, "Move to bounds: " + bounds.toString());
+        Log.e(MapboxConstants.TAG, "Resulting bounds:" + mapboxMap.getProjection().getVisibleRegion().latLngBounds.toString());
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mMapView.onResume();
+        mapView.onResume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mMapView.onPause();
+        mapView.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        mMapView.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mMapView.onDestroy();
+        mapView.onDestroy();
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        mMapView.onLowMemory();
+        mapView.onLowMemory();
     }
 
     @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
index 897380d1aa..477ef64e86 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
@@ -20,7 +20,7 @@ import com.mapbox.mapboxsdk.testapp.R;
 
 public class ManualZoomActivity extends AppCompatActivity {
 
-    private MapboxMap mMapboxMap;
+    private MapboxMap mapboxMap;
     private MapView mMapView;
 
     @Override
@@ -37,15 +37,15 @@ public class ManualZoomActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        mMapView = (MapView) findViewById(R.id.manualZoomMapView);
+        mMapView = (MapView) findViewById(R.id.mapView);
         mMapView.setStyleUrl(Style.SATELLITE);
         mMapView.onCreate(savedInstanceState);
         mMapView.getMapAsync(new OnMapReadyCallback() {
             @Override
             public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                mMapboxMap = mapboxMap;
+                ManualZoomActivity.this.mapboxMap = mapboxMap;
 
-                UiSettings uiSettings = mMapboxMap.getUiSettings();
+                UiSettings uiSettings = ManualZoomActivity.this.mapboxMap.getUiSettings();
                 uiSettings.setAllGesturesEnabled(false);
             }
         });
@@ -67,23 +67,23 @@ public class ManualZoomActivity extends AppCompatActivity {
                 return true;
 
             case R.id.action_zoom_in:
-                mMapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
+                mapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
                 return true;
 
             case R.id.action_zoom_out:
-                mMapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
+                mapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
                 return true;
 
             case R.id.action_zoom_by:
-                mMapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2));
+                mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2));
                 return true;
             case R.id.action_zoom_to:
-                mMapboxMap.animateCamera(CameraUpdateFactory.zoomTo(2));
+                mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(2));
                 return true;
 
             case R.id.action_zoom_to_point:
                 View view = getWindow().getDecorView();
-                mMapboxMap.animateCamera(CameraUpdateFactory.zoomBy(1, new Point(view.getMeasuredWidth() / 4, view.getMeasuredHeight() / 4)));
+                mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(1, new Point(view.getMeasuredWidth() / 4, view.getMeasuredHeight() / 4)));
                 return true;
 
             default:
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
index e9a9647d45..9fcdfa3880 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.testapp.activity.camera;
 
 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;
@@ -10,14 +9,15 @@ import android.view.MenuItem;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-public class MaxMinZoomActivity extends AppCompatActivity {
+public class MaxMinZoomActivity extends AppCompatActivity implements OnMapReadyCallback {
 
-    private MapView mMapView;
+    private MapView mapView;
+    private MapboxMap mapboxMap;
 
     @Override
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_maxmin_zoom);
@@ -31,15 +31,16 @@ public class MaxMinZoomActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
-            @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                mapboxMap.setMinZoom(3);
-                mapboxMap.setMaxZoom(5);
-            }
-        });
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(this);
+    }
+
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        mapboxMap.setMinZoom(3);
+        mapboxMap.setMaxZoom(5);
     }
 
     @Override
@@ -55,31 +56,31 @@ public class MaxMinZoomActivity extends AppCompatActivity {
     @Override
     public void onResume() {
         super.onResume();
-        mMapView.onResume();
+        mapView.onResume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mMapView.onPause();
+        mapView.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        mMapView.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mMapView.onDestroy();
+        mapView.onDestroy();
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        mMapView.onLowMemory();
+        mapView.onLowMemory();
     }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
index 729a08758e..1154cccb6e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
@@ -20,11 +20,13 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-public class ScrollByActivity extends AppCompatActivity {
+public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     public static final int MULTIPLIER_PER_PIXEL = 50;
 
-    private MapView mMapView;
+    private MapView mapView;
+    private MapboxMap mapboxMap;
+    private SeekBar xBar, yBar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,35 +42,36 @@ public class ScrollByActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        final SeekBar xBar = (SeekBar) findViewById(R.id.seekbar_move_x);
+        xBar = (SeekBar) findViewById(R.id.seekbar_move_x);
         TextView xText = (TextView) findViewById(R.id.textview_x);
         xBar.setOnSeekBarChangeListener(new PixelBarChangeListener(xText, R.string.scrollby_x_value));
 
-        final SeekBar yBar = (SeekBar) findViewById(R.id.seekbar_move_y);
+        yBar = (SeekBar) findViewById(R.id.seekbar_move_y);
         TextView yText = (TextView) findViewById(R.id.textview_y);
         yBar.setOnSeekBarChangeListener(new PixelBarChangeListener(yText, R.string.scrollby_y_value));
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.setTag(true);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.setTag(true);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(this);
+    }
+
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        UiSettings uiSettings = mapboxMap.getUiSettings();
+        uiSettings.setLogoEnabled(false);
+        uiSettings.setAttributionEnabled(false);
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setColorFilter(ContextCompat.getColor(ScrollByActivity.this, R.color.primary));
+        fab.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                UiSettings uiSettings = mapboxMap.getUiSettings();
-                uiSettings.setLogoEnabled(false);
-                uiSettings.setAttributionEnabled(false);
-
-                FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-                fab.setColorFilter(ContextCompat.getColor(ScrollByActivity.this, R.color.primary));
-                fab.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mapboxMap.easeCamera(CameraUpdateFactory.scrollBy(
-                                        xBar.getProgress() * MULTIPLIER_PER_PIXEL,
-                                        yBar.getProgress() * MULTIPLIER_PER_PIXEL)
-                        );
-                    }
-                });
+            public void onClick(View v) {
+                mapboxMap.easeCamera(CameraUpdateFactory.scrollBy(
+                        xBar.getProgress() * MULTIPLIER_PER_PIXEL,
+                        yBar.getProgress() * MULTIPLIER_PER_PIXEL)
+                );
             }
         });
     }
@@ -76,31 +79,31 @@ public class ScrollByActivity extends AppCompatActivity {
     @Override
     public void onResume() {
         super.onResume();
-        mMapView.onResume();
+        mapView.onResume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mMapView.onPause();
+        mapView.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        mMapView.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mMapView.onDestroy();
+        mapView.onDestroy();
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        mMapView.onLowMemory();
+        mapView.onLowMemory();
     }
 
     @Override
@@ -141,6 +144,4 @@ public class ScrollByActivity extends AppCompatActivity {
 
         }
     }
-
-
 }
\ No newline at end of file