[android] Checkstyle fixes round 1 (#6234)

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

* added back MapboxMap for espresso

3 files changed, 16 insertions, 8 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
index 532bb1c18c..f9a067daf0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
@@ -31,7 +31,6 @@ public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity {
 
     public MapView mapView;
     private MapboxMap mapboxMap;
-    private Marker marker;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,7 +63,10 @@ public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity {
                         List<Feature> features = mapboxMap.queryRenderedFeatures(box);
 
                         //Show count
-                        Toast.makeText(QueryRenderedFeaturesBoxCountActivity.this, String.format("%s features in box", features.size()), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(
+                            QueryRenderedFeaturesBoxCountActivity.this,
+                            String.format("%s features in box", features.size()),
+                            Toast.LENGTH_SHORT).show();
 
                         //Debug output
                         debugOutput(features);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
index a993feebf9..1e8f91857b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
@@ -35,7 +35,6 @@ public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity
 
     public MapView mapView;
     private MapboxMap mapboxMap;
-    private Marker marker;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,7 +57,7 @@ public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity
 
                 selectionBox.setOnClickListener(new View.OnClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onClick(View view) {
                         //Query
                         int top = selectionBox.getTop() - mapView.getTop();
                         int left = selectionBox.getLeft() - mapView.getLeft();
@@ -67,19 +66,23 @@ public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity
                         List<Feature> features = mapboxMap.queryRenderedFeatures(box, "building");
 
                         //Show count
-                        Toast.makeText(QueryRenderedFeaturesBoxHighlightActivity.this, String.format("%s features in box", features.size()), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(
+                            QueryRenderedFeaturesBoxHighlightActivity.this,
+                            String.format("%s features in box", features.size()),
+                            Toast.LENGTH_SHORT).show();
 
                         //remove layer / source if already added
                         try {
                             mapboxMap.removeSource("highlighted-shapes-source");
                             mapboxMap.removeLayer("highlighted-shapes-layer");
-                        } catch (Exception e) {
+                        } catch (Exception exception) {
                             //that's ok
                         }
 
                         //Add layer / source
                         mapboxMap.addSource(new GeoJsonSource("highlighted-shapes-source", FeatureCollection.fromFeatures(features)));
-                        mapboxMap.addLayer(new FillLayer("highlighted-shapes-layer", "highlighted-shapes-source").withProperties(fillColor(Color.RED)));
+                        mapboxMap.addLayer(new FillLayer("highlighted-shapes-layer", "highlighted-shapes-source")
+                            .withProperties(fillColor(Color.RED)));
                     }
                 });
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
index 7ce1a68a79..8abf638d16 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
@@ -64,7 +64,10 @@ public class QueryRenderedFeaturesPropertiesActivity extends AppCompatActivity {
                     public void onMapClick(@NonNull LatLng point) {
                         //Query
                         final PointF pixel = mapboxMap.getProjection().toScreenLocation(point);
-                        Log.i(TAG, String.format("Requesting features for %sx%s (%sx%s adjusted for density)", pixel.x, pixel.y, pixel.x / density, pixel.y / density));
+                        Log.i(TAG, String.format(
+                            "Requesting features for %sx%s (%sx%s adjusted for density)",
+                            pixel.x, pixel.y, pixel.x / density, pixel.y / density)
+                        );
                         List<Feature> features = mapboxMap.queryRenderedFeatures(pixel);
 
                         //Debug output