[android] Checkstyle fixes round 1 (#6234)

* removed last of hungarian notation from testapp and fixed other checkstyle issues

* added back MapboxMap for espresso

8 files changed, 161 insertions, 141 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
index 282ac9b18c..569d5298a4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -31,7 +31,7 @@ import java.util.Random;
 
 public class AnimatedMarkerActivity extends AppCompatActivity {
 
-    private MapView mMapView;
+    private MapView mapView;
     private MapboxMap mapboxMap;
 
     private LatLng dupontCircle = new LatLng(38.90962, -77.04341);
@@ -53,9 +53,9 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
 
             @Override
             public void onMapReady(@NonNull final MapboxMap mapboxMap) {
@@ -75,9 +75,9 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
 
     private void setupMap() {
         CameraPosition cameraPosition = new CameraPosition.Builder()
-                .target(dupontCircle)
-                .zoom(15)
-                .build();
+            .target(dupontCircle)
+            .zoom(15)
+            .build();
         mapboxMap.setCameraPosition(cameraPosition);
     }
 
@@ -86,10 +86,10 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
 
         if (passengerMarker == null) {
             Icon icon = IconFactory.getInstance(AnimatedMarkerActivity.this)
-                    .fromResource(R.drawable.ic_directions_run_black_24dp);
+                .fromResource(R.drawable.ic_directions_run_black_24dp);
             passengerMarker = mapboxMap.addMarker(new MarkerViewOptions()
-                    .position(randomLatLng)
-                    .icon(icon));
+                .position(randomLatLng)
+                .icon(icon));
         } else {
             passengerMarker.setPosition(randomLatLng);
         }
@@ -139,7 +139,8 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
     private ValueAnimator animateMoveMarker(final MarkerView marker, LatLng to) {
         marker.setRotation((float) getBearing(marker.getPosition(), to));
 
-        final ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position", new LatLngEvaluator(), marker.getPosition(), to);
+        final ValueAnimator markerAnimator = ObjectAnimator.ofObject(
+            marker, "position", new LatLngEvaluator(), marker.getPosition(), to);
         markerAnimator.setDuration((long) (10 * marker.getPosition().distanceTo(to)));
         markerAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
 
@@ -151,12 +152,12 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
 
     private MarkerView createCarMarker(LatLng start, @DrawableRes int carResource) {
         Icon icon = IconFactory.getInstance(AnimatedMarkerActivity.this)
-                .fromResource(carResource);
+            .fromResource(carResource);
 
         //View Markers
         return mapboxMap.addMarker(new MarkerViewOptions()
-                .position(start)
-                .icon(icon));
+            .position(start)
+            .icon(icon));
 
         //GL Markers
 //        return mapboxMap.addMarker(new MarkerOptions()
@@ -168,8 +169,10 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
     private LatLng getLatLngInBounds() {
         LatLngBounds bounds = mapboxMap.getProjection().getVisibleRegion().latLngBounds;
         Random generator = new Random();
-        double randomLat = bounds.getLatSouth() + generator.nextDouble() * (bounds.getLatNorth() - bounds.getLatSouth());
-        double randomLon = bounds.getLonWest() + generator.nextDouble() * (bounds.getLonEast() - bounds.getLonWest());
+        double randomLat = bounds.getLatSouth() + generator.nextDouble()
+            * (bounds.getLatNorth() - bounds.getLatSouth());
+        double randomLon = bounds.getLonWest() + generator.nextDouble()
+            * (bounds.getLonEast() - bounds.getLonWest());
         return new LatLng(randomLat, randomLon);
     }
 
@@ -187,31 +190,31 @@ public class AnimatedMarkerActivity 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();
     }
 
     /**
@@ -219,13 +222,15 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
      */
     private static class LatLngEvaluator implements TypeEvaluator<LatLng> {
 
-        private LatLng mLatLng = new LatLng();
+        private LatLng latLng = new LatLng();
 
         @Override
         public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
-            mLatLng.setLatitude(startValue.getLatitude() + ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
-            mLatLng.setLongitude(startValue.getLongitude() + ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
-            return mLatLng;
+            latLng.setLatitude(startValue.getLatitude()
+                + ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
+            latLng.setLongitude(startValue.getLongitude()
+                + ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
+            return latLng;
         }
     }
 
@@ -238,8 +243,8 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
         double lat1 = degrees2radians * from.getLatitude();
         double lat2 = degrees2radians * to.getLatitude();
         double a = Math.sin(lon2 - lon1) * Math.cos(lat2);
-        double b = Math.cos(lat1) * Math.sin(lat2) -
-                Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon2 - lon1);
+        double b = Math.cos(lat1) * Math.sin(lat2)
+            - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon2 - lon1);
 
         return radians2degrees * Math.atan2(a, b);
     }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 8e2766c075..148207bab9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -44,9 +44,9 @@ import java.util.Random;
 public class BulkMarkerActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
 
     private MapboxMap mapboxMap;
-    private MapView mMapView;
-    private boolean mCustomMarkerView;
-    private List<LatLng> mLocations;
+    private MapView mapView;
+    private boolean customMarkerView;
+    private List<LatLng> locations;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -63,15 +63,16 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
             @Override
             public void onMapReady(@NonNull MapboxMap mapboxMap) {
                 BulkMarkerActivity.this.mapboxMap = mapboxMap;
 
                 if (actionBar != null) {
-                    ArrayAdapter<CharSequence> spinnerAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.bulk_marker_list, android.R.layout.simple_spinner_item);
+                    ArrayAdapter<CharSequence> spinnerAdapter = ArrayAdapter.createFromResource(
+                        actionBar.getThemedContext(), R.array.bulk_marker_list, android.R.layout.simple_spinner_item);
                     spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
                     Spinner spinner = (Spinner) findViewById(R.id.spinner);
                     spinner.setAdapter(spinnerAdapter);
@@ -89,7 +90,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         int amount = Integer.valueOf(getResources().getStringArray(R.array.bulk_marker_list)[position]);
-        if (mLocations == null) {
+        if (locations == null) {
             new LoadLocationTask(this, amount).execute();
         } else {
             showMarkers(amount);
@@ -97,18 +98,18 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     }
 
     private void onLatLngListLoaded(List<LatLng> latLngs, int amount) {
-        mLocations = latLngs;
+        locations = latLngs;
         showMarkers(amount);
     }
 
     private void showMarkers(int amount) {
         mapboxMap.clear();
 
-        if (mLocations.size() < amount) {
-            amount = mLocations.size();
+        if (locations.size() < amount) {
+            amount = locations.size();
         }
 
-        if (mCustomMarkerView) {
+        if (customMarkerView) {
             showViewMarkers(amount);
         } else {
             showGlMarkers(amount);
@@ -127,13 +128,13 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
 
         List<MarkerViewOptions> markerOptionsList = new ArrayList<>();
         for (int i = 0; i < amount; i++) {
-            randomIndex = random.nextInt(mLocations.size());
-            LatLng latLng = mLocations.get(randomIndex);
+            randomIndex = random.nextInt(locations.size());
+            LatLng latLng = locations.get(randomIndex);
             MarkerViewOptions markerOptions = new MarkerViewOptions()
-                    .position(latLng)
-                    .icon(icon)
-                    .title(String.valueOf(i))
-                    .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude()));
+                .position(latLng)
+                .icon(icon)
+                .title(String.valueOf(i))
+                .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude()));
             markerOptionsList.add(markerOptions);
         }
         mapboxMap.addMarkerViews(markerOptionsList);
@@ -146,12 +147,12 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
         int randomIndex;
 
         for (int i = 0; i < amount; i++) {
-            randomIndex = random.nextInt(mLocations.size());
-            LatLng latLng = mLocations.get(randomIndex);
+            randomIndex = random.nextInt(locations.size());
+            LatLng latLng = locations.get(randomIndex);
             markerOptionsList.add(new MarkerOptions()
-                    .position(latLng)
-                    .title(String.valueOf(i))
-                    .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude())));
+                .position(latLng)
+                .title(String.valueOf(i))
+                .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude())));
         }
 
         mapboxMap.addMarkers(markerOptionsList);
@@ -165,31 +166,31 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     @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
@@ -207,7 +208,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
         @Override
         public void onClick(final View v) {
             if (mapboxMap != null) {
-                mCustomMarkerView = true;
+                customMarkerView = true;
 
                 // remove fab
                 v.animate().alpha(0).setListener(new AnimatorListenerAdapter() {
@@ -221,29 +222,35 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
                 // reload markers
                 Spinner spinner = (Spinner) findViewById(R.id.spinner);
                 if (spinner != null) {
-                    int amount = Integer.valueOf(getResources().getStringArray(R.array.bulk_marker_list)[spinner.getSelectedItemPosition()]);
+                    int amount = Integer.valueOf(
+                        getResources().getStringArray(R.array.bulk_marker_list)[spinner.getSelectedItemPosition()]);
                     showMarkers(amount);
                 }
 
-                mMapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
+                mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
                     @Override
                     public void onMapChanged(@MapView.MapChange int change) {
                         if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
                             if (!mapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) {
                                 TextView viewCountView = (TextView) findViewById(R.id.countView);
-                                viewCountView.setText("ViewCache size " + (mMapView.getChildCount() - 5));
+                                viewCountView.setText("ViewCache size " + (mapView.getChildCount() - 5));
                             }
                         }
                     }
                 });
 
-                mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() {
-                    @Override
-                    public boolean onMarkerClick(@NonNull Marker marker, @NonNull View view, @NonNull MapboxMap.MarkerViewAdapter adapter) {
-                        Toast.makeText(BulkMarkerActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show();
-                        return false;
-                    }
-                });
+                mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(
+                    new MapboxMap.OnMarkerViewClickListener() {
+                        @Override
+                        public boolean onMarkerClick(
+                            @NonNull Marker marker, @NonNull View view, @NonNull MapboxMap.MarkerViewAdapter adapter) {
+                            Toast.makeText(
+                                BulkMarkerActivity.this,
+                                "Hello " + marker.getId(),
+                                Toast.LENGTH_SHORT).show();
+                            return false;
+                        }
+                    });
             }
         }
     }
@@ -251,23 +258,23 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     private static class LoadLocationTask extends AsyncTask<Void, Integer, List<LatLng>> {
 
         private static final String TAG = "LoadLocationTask";
-        private BulkMarkerActivity mActivity;
-        private ProgressDialog mProgressDialog;
-        private int mAmount;
+        private BulkMarkerActivity activity;
+        private ProgressDialog progressDialog;
+        private int amount;
 
         public LoadLocationTask(BulkMarkerActivity activity, int amount) {
-            mAmount = amount;
-            mActivity = activity;
-            mProgressDialog = ProgressDialog.show(activity, "Loading", "Fetching markers", false);
+            this.amount = amount;
+            this.activity = activity;
+            progressDialog = ProgressDialog.show(activity, "Loading", "Fetching markers", false);
         }
 
         @Override
         protected List<LatLng> doInBackground(Void... params) {
             try {
-                String json = GeoParseUtil.loadStringFromAssets(mActivity.getApplicationContext(), "points.geojson");
+                String json = GeoParseUtil.loadStringFromAssets(activity.getApplicationContext(), "points.geojson");
                 return GeoParseUtil.parseGeoJSONCoordinates(json);
-            } catch (IOException | JSONException e) {
-                Log.e(TAG, "Could not add markers,", e);
+            } catch (IOException | JSONException exception) {
+                Log.e(TAG, "Could not add markers,", exception);
                 return null;
             }
         }
@@ -275,8 +282,8 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
         @Override
         protected void onPostExecute(List<LatLng> locations) {
             super.onPostExecute(locations);
-            mActivity.onLatLngListLoaded(locations, mAmount);
-            mProgressDialog.hide();
+            activity.onLatLngListLoaded(locations, amount);
+            progressDialog.hide();
         }
     }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
index 53909dc051..431908017f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
@@ -69,7 +69,7 @@ public class DynamicMarkerChangeActivity extends AppCompatActivity {
         fab.setColorFilter(ContextCompat.getColor(this, R.color.primary));
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onClick(View view) {
                 if (mapboxMap != null) {
                     updateMarker();
                 }
@@ -85,8 +85,10 @@ public class DynamicMarkerChangeActivity extends AppCompatActivity {
         // update marker
         marker.setPosition(first ? LAT_LNG_CHELSEA : LAT_LNG_ARSENAL);
         marker.setIcon(iconFactory.fromResource(first ? R.drawable.ic_chelsea : R.drawable.ic_arsenal));
-        marker.setTitle(first ? getString(R.string.dynamic_marker_chelsea_title) : getString(R.string.dynamic_marker_arsenal_title));
-        marker.setSnippet(first ? getString(R.string.dynamic_marker_chelsea_snippet) : getString(R.string.dynamic_marker_arsenal_snippet));
+        marker.setTitle(first
+            ? getString(R.string.dynamic_marker_chelsea_title) : getString(R.string.dynamic_marker_arsenal_title));
+        marker.setSnippet(first
+            ? getString(R.string.dynamic_marker_chelsea_snippet) : getString(R.string.dynamic_marker_arsenal_snippet));
     }
 
     @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
index ce86a78099..ccce727130 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
@@ -42,15 +42,16 @@ import java.util.Random;
 public class MarkerViewActivity extends AppCompatActivity {
 
     private MapboxMap mapboxMap;
-    private MapView mMapView;
+    private MapView mapView;
 
-    private MarkerView movingMarkerOne, movingMarkerTwo;
+    private MarkerView movingMarkerOne;
+    private MarkerView movingMarkerTwo;
     private Random randomAnimator = new Random();
     private Handler locationUpdateHandler = new Handler();
     private Runnable moveMarkerRunnable = new MoveMarkerRunnable();
     private int rotation = 0;
 
-    private final static LatLng[] LAT_LNGS = new LatLng[]{
+    private static final LatLng[] LAT_LNGS = new LatLng[]{
             new LatLng(38.897424, -77.036508),
             new LatLng(38.909698, -77.029642),
             new LatLng(38.907227, -77.036530),
@@ -74,9 +75,9 @@ public class MarkerViewActivity extends AppCompatActivity {
         }
 
         final TextView viewCountView = (TextView) findViewById(R.id.countView);
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
             @Override
             public void onMapReady(@NonNull MapboxMap mapboxMap) {
                 MarkerViewActivity.this.mapboxMap = mapboxMap;
@@ -131,12 +132,12 @@ public class MarkerViewActivity extends AppCompatActivity {
                 markerViewManager.addMarkerViewAdapter(new TextAdapter(MarkerViewActivity.this, mapboxMap));
 
                 // add a change listener to validate the size of amount of child views
-                mMapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
+                mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
                     @Override
                     public void onMapChanged(@MapView.MapChange int change) {
                         if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
                             if (!markerViewManager.getMarkerViewAdapters().isEmpty() && viewCountView != null) {
-                                viewCountView.setText("ViewCache size " + (mMapView.getChildCount() - 5));
+                                viewCountView.setText("ViewCache size " + (mapView.getChildCount() - 5));
                             }
                         }
                     }
@@ -153,13 +154,13 @@ public class MarkerViewActivity extends AppCompatActivity {
 
                 movingMarkerOne = MarkerViewActivity.this.mapboxMap.addMarker(new MarkerViewOptions()
                         .position(CarLocation.CAR_0_LNGS[0])
-                        .icon(IconFactory.getInstance(mMapView.getContext())
+                        .icon(IconFactory.getInstance(mapView.getContext())
                                 .fromResource(R.drawable.ic_chelsea))
                 );
 
                 movingMarkerTwo = mapboxMap.addMarker(new MarkerViewOptions()
                         .position(CarLocation.CAR_1_LNGS[0])
-                        .icon(IconFactory.getInstance(mMapView.getContext())
+                        .icon(IconFactory.getInstance(mapView.getContext())
                                 .fromResource(R.drawable.ic_arsenal))
                 );
             }
@@ -227,7 +228,8 @@ public class MarkerViewActivity extends AppCompatActivity {
         }
 
         @Override
-        public boolean onSelect(@NonNull final CountryMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
+        public boolean onSelect(
+            @NonNull final CountryMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
             convertView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
             ObjectAnimator rotateAnimator = ObjectAnimator.ofFloat(convertView, View.ROTATION, 0, 360);
             rotateAnimator.setDuration(reselectionForViewReuse ? 0 : 350);
@@ -295,7 +297,8 @@ public class MarkerViewActivity extends AppCompatActivity {
         }
 
         @Override
-        public boolean onSelect(@NonNull final TextMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
+        public boolean onSelect(
+            @NonNull final TextMarkerView marker, @NonNull final View convertView, boolean reselectionForViewReuse) {
             animateGrow(marker, convertView, 0);
 
             // false indicates that we are calling selectMarker after our animation ourselves
@@ -366,31 +369,31 @@ public class MarkerViewActivity 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
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java
index bd183b9ab9..e4a3b3b2cb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java
@@ -42,8 +42,8 @@ public class MarkerViewScaleActivity extends AppCompatActivity implements OnMapR
         }
 
         final SeekBar xBar = (SeekBar) findViewById(R.id.seekbar_factor);
-        TextView xText = (TextView) findViewById(R.id.textview_factor);
-        xBar.setOnSeekBarChangeListener(new FactorChangeListener(xText));
+        TextView textView = (TextView) findViewById(R.id.textview_factor);
+        xBar.setOnSeekBarChangeListener(new FactorChangeListener(textView));
 
         mapView = (MapView) findViewById(R.id.mapView);
         mapView.onCreate(savedInstanceState);
@@ -56,12 +56,12 @@ public class MarkerViewScaleActivity extends AppCompatActivity implements OnMapR
         Icon icon = IconFactory.getInstance(MarkerViewScaleActivity.this)
                 .fromResource(R.drawable.ic_circle);
 
-        MarkerView mMarker = mapboxMap.addMarker(new MarkerViewOptions()
+        MarkerView marker = mapboxMap.addMarker(new MarkerViewOptions()
                 .position(new LatLng(38.907192, -77.036871))
                 .icon(icon)
                 .flat(true));
 
-        markerView = mapboxMap.getMarkerViewManager().getView(mMarker);
+        markerView = mapboxMap.getMarkerViewManager().getView(marker);
     }
 
     @Override
@@ -107,16 +107,16 @@ public class MarkerViewScaleActivity extends AppCompatActivity implements OnMapR
 
     private class FactorChangeListener implements SeekBar.OnSeekBarChangeListener {
 
-        private TextView xText;
+        private TextView textView;
 
-        public FactorChangeListener(TextView xText) {
-            this.xText = xText;
+        public FactorChangeListener(TextView textView) {
+            this.textView = textView;
         }
 
         @Override
         public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
             float newScale = getScale(progress);
-            xText.setText(String.format(Locale.US, "Scale: %.1f", newScale));
+            textView.setText(String.format(Locale.US, "Scale: %.1f", newScale));
             if (MarkerViewScaleActivity.this.markerView != null) {
                 markerView.setScaleX(newScale);
                 markerView.setScaleY(newScale);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
index d2b00e3335..6638f8a2de 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
@@ -43,13 +43,15 @@ public class PolygonActivity extends AppCompatActivity implements OnMapReadyCall
         add(new LatLng(45.510677, -122.648792));
         add(new LatLng(45.515008, -122.664070));
         add(new LatLng(45.502496, -122.669048));
-    }};
+    }
+    };
 
     private List<LatLng> ADDITIONAL_POINTS = new ArrayList<LatLng>() {{
         add(new LatLng(45.515369, -122.678489));
         add(new LatLng(45.506346, -122.702007));
         add(new LatLng(45.522585, -122.685699));
-    }};
+    }
+    };
 
     private MapView mapView;
     private MapboxMap mapboxMap;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
index 7dec4e9038..dabac927d9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
@@ -37,9 +37,9 @@ public class PolylineActivity extends AppCompatActivity {
     private static final float PARTIAL_ALPHA = 0.5f;
     private static final float NO_ALPHA = 0.0f;
 
-    private List<Polyline> mPolylines;
-    private ArrayList<PolylineOptions> mPolylineOptions = new ArrayList<>();
-    private MapView mMapView;
+    private List<Polyline> polylines;
+    private ArrayList<PolylineOptions> polylineOptions = new ArrayList<>();
+    private MapView mapView;
     private MapboxMap mapboxMap;
 
     private boolean fullAlpha = true;
@@ -62,18 +62,18 @@ public class PolylineActivity extends AppCompatActivity {
         }
 
         if (savedInstanceState != null) {
-            mPolylineOptions = savedInstanceState.getParcelableArrayList(STATE_POLYLINE_OPTIONS);
+            polylineOptions = savedInstanceState.getParcelableArrayList(STATE_POLYLINE_OPTIONS);
         } else {
-            mPolylineOptions.addAll(getAllPolylines());
+            polylineOptions.addAll(getAllPolylines());
         }
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
             @Override
             public void onMapReady(@NonNull MapboxMap mapboxMap) {
                 PolylineActivity.this.mapboxMap = mapboxMap;
-                mPolylines = mapboxMap.addPolylines(mPolylineOptions);
+                polylines = mapboxMap.addPolylines(polylineOptions);
             }
         });
 
@@ -81,20 +81,20 @@ public class PolylineActivity extends AppCompatActivity {
         if (fab != null) {
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
-                public void onClick(View v) {
+                public void onClick(View view) {
                     if (mapboxMap != null) {
-                        if (mPolylines != null && mPolylines.size() > 0) {
-                            if (mPolylines.size() == 1) {
+                        if (polylines != null && polylines.size() > 0) {
+                            if (polylines.size() == 1) {
                                 // test for removing annotation
-                                mapboxMap.removeAnnotation(mPolylines.get(0));
+                                mapboxMap.removeAnnotation(polylines.get(0));
                             } else {
                                 // test for removing annotations
-                                mapboxMap.removeAnnotations(mPolylines);
+                                mapboxMap.removeAnnotations(polylines);
                             }
                         }
-                        mPolylineOptions.clear();
-                        mPolylineOptions.addAll(getRandomLine());
-                        mPolylines = mapboxMap.addPolylines(mPolylineOptions);
+                        polylineOptions.clear();
+                        polylineOptions.addAll(getRandomLine());
+                        polylines = mapboxMap.addPolylines(polylineOptions);
 
                     }
                 }
@@ -126,38 +126,39 @@ public class PolylineActivity extends AppCompatActivity {
         Collections.shuffle(randomLines);
         return new ArrayList<PolylineOptions>() {{
             add(randomLines.get(0));
-        }};
+        }
+        };
     }
 
     @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);
-        outState.putParcelableArrayList(STATE_POLYLINE_OPTIONS, mPolylineOptions);
+        mapView.onSaveInstanceState(outState);
+        outState.putParcelableArrayList(STATE_POLYLINE_OPTIONS, polylineOptions);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mMapView.onDestroy();
+        mapView.onDestroy();
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        mMapView.onLowMemory();
+        mapView.onLowMemory();
     }
 
     @Override
@@ -171,34 +172,34 @@ public class PolylineActivity extends AppCompatActivity {
         switch (item.getItemId()) {
             case R.id.action_id_remove:
                 // test to remove all annotations
-                mPolylineOptions.clear();
+                polylineOptions.clear();
                 mapboxMap.clear();
                 return true;
 
             case R.id.action_id_alpha:
                 fullAlpha = !fullAlpha;
-                for (Polyline p : mPolylines) {
+                for (Polyline p : polylines) {
                     p.setAlpha(fullAlpha ? FULL_ALPHA : PARTIAL_ALPHA);
                 }
                 return true;
 
             case R.id.action_id_color:
                 color = !color;
-                for (Polyline p : mPolylines) {
+                for (Polyline p : polylines) {
                     p.setColor(color ? Color.RED : Color.BLUE);
                 }
                 return true;
 
             case R.id.action_id_width:
                 width = !width;
-                for (Polyline p : mPolylines) {
+                for (Polyline p : polylines) {
                     p.setWidth(width ? 3.0f : 5.0f);
                 }
                 return true;
 
             case R.id.action_id_visible:
                 visible = !visible;
-                for (Polyline p : mPolylines) {
+                for (Polyline p : polylines) {
                     p.setAlpha(visible ? (fullAlpha ? FULL_ALPHA : PARTIAL_ALPHA) : NO_ALPHA);
                 }
                 return true;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
index 6784ac0914..f5030ba649 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
@@ -24,7 +24,7 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
     private MapView mapView;
     private MapboxMap mapboxMap;
-    private ArrayList<MarkerOptions> mMarkerList = new ArrayList<>();
+    private ArrayList<MarkerOptions> markerList = new ArrayList<>();
 
     private static final DecimalFormat LAT_LON_FORMATTER = new DecimalFormat("#.#####");
 
@@ -65,14 +65,14 @@ public class PressForMarkerActivity extends AppCompatActivity {
                                 .title(title)
                                 .snippet(snippet);
 
-                        mMarkerList.add(marker);
+                        markerList.add(marker);
                         mapboxMap.addMarker(marker);
                     }
                 });
 
                 if (savedInstanceState != null) {
-                    mMarkerList = savedInstanceState.getParcelableArrayList(STATE_MARKER_LIST);
-                    mapboxMap.addMarkers(mMarkerList);
+                    markerList = savedInstanceState.getParcelableArrayList(STATE_MARKER_LIST);
+                    mapboxMap.addMarkers(markerList);
                 }
             }
         });
@@ -96,7 +96,7 @@ public class PressForMarkerActivity extends AppCompatActivity {
         super.onSaveInstanceState(outState);
 
         mapView.onSaveInstanceState(outState);
-        outState.putParcelableArrayList(STATE_MARKER_LIST, mMarkerList);
+        outState.putParcelableArrayList(STATE_MARKER_LIST, markerList);
     }
 
     @Override