[android] Checkstyle fixes round 1 (#6234)

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

* added back MapboxMap for espresso

1 files changed, 51 insertions, 45 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
index d65eeda9f0..d89f3e2cf8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
@@ -32,12 +32,14 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-public class MyLocationTrackingModeActivity extends AppCompatActivity implements MapboxMap.OnMyLocationChangeListener, AdapterView.OnItemSelectedListener {
+public class MyLocationTrackingModeActivity extends AppCompatActivity
+    implements MapboxMap.OnMyLocationChangeListener, AdapterView.OnItemSelectedListener {
 
-    private MapView mMapView;
+    private MapView mapView;
     private MapboxMap mapboxMap;
-    private Spinner mLocationSpinner, mBearingSpinner;
-    private Location mLocation;
+    private Spinner locationSpinner;
+    private Spinner bearingSpinner;
+    private Location location;
     private static final int PERMISSIONS_LOCATION = 0;
 
     @Override
@@ -55,9 +57,9 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
             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) {
                 MyLocationTrackingModeActivity.this.mapboxMap = mapboxMap;
@@ -69,25 +71,27 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
 
                 mapboxMap.setOnMyLocationChangeListener(MyLocationTrackingModeActivity.this);
 
-                ArrayAdapter<CharSequence> locationTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_tracking_mode, android.R.layout.simple_spinner_item);
+                ArrayAdapter<CharSequence> locationTrackingAdapter = ArrayAdapter.createFromResource(
+                    actionBar.getThemedContext(), R.array.user_tracking_mode, android.R.layout.simple_spinner_item);
                 locationTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                mLocationSpinner = (Spinner) findViewById(R.id.spinner_location);
-                mLocationSpinner.setAdapter(locationTrackingAdapter);
-                mLocationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+                locationSpinner = (Spinner) findViewById(R.id.spinner_location);
+                locationSpinner.setAdapter(locationTrackingAdapter);
+                locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
 
-                ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
+                ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(
+                    actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
                 bearingTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                mBearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
-                mBearingSpinner.setAdapter(bearingTrackingAdapter);
-                mBearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+                bearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
+                bearingSpinner.setAdapter(bearingTrackingAdapter);
+                bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
 
                 mapboxMap.setOnMyLocationTrackingModeChangeListener(new MapboxMap.OnMyLocationTrackingModeChangeListener() {
                     @Override
                     public void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode) {
                         if (MyLocationTracking.TRACKING_NONE == myLocationTrackingMode) {
-                            mLocationSpinner.setOnItemSelectedListener(null);
-                            mLocationSpinner.setSelection(0);
-                            mLocationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+                            locationSpinner.setOnItemSelectedListener(null);
+                            locationSpinner.setSelection(0);
+                            locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
                         }
                     }
                 });
@@ -96,9 +100,9 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
                     @Override
                     public void onMyBearingTrackingModeChange(@MyBearingTracking.Mode int myBearingTrackingMode) {
                         if (MyBearingTracking.NONE == myBearingTrackingMode) {
-                            mBearingSpinner.setOnItemSelectedListener(null);
-                            mBearingSpinner.setSelection(0);
-                            mBearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+                            bearingSpinner.setOnItemSelectedListener(null);
+                            bearingSpinner.setSelection(0);
+                            bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
                         }
                     }
                 });
@@ -113,9 +117,13 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     @UiThread
     public void toggleGps(boolean enableGps) {
         if (enableGps) {
-            if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
-                    (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_LOCATION);
+            if ((ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED)
+                || (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED)) {
+                ActivityCompat.requestPermissions(this, new String[]{
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                    Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_LOCATION);
             } else {
                 enableLocation(true);
             }
@@ -137,12 +145,10 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSIONS_LOCATION: {
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    enableLocation(true);
-                }
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == PERMISSIONS_LOCATION) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                enableLocation(true);
             }
         }
     }
@@ -150,18 +156,18 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     private void setInitialPosition(LatLng latLng) {
         mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
         mapboxMap.setMyLocationEnabled(true);
-        mLocationSpinner.setEnabled(true);
-        mBearingSpinner.setEnabled(true);
+        locationSpinner.setEnabled(true);
+        bearingSpinner.setEnabled(true);
     }
 
     @Override
     public void onMyLocationChange(@Nullable Location location) {
         if (location != null) {
-            if (mLocation == null) {
+            if (this.location == null) {
                 // initial location to reposition map
                 setInitialPosition(new LatLng(location));
             }
-            mLocation = location;
+            this.location = location;
             showSnackBar();
         }
     }
@@ -169,16 +175,16 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     private void showSnackBar() {
         String desc = "Loc Chg: ";
         boolean noInfo = true;
-        if (mLocation.hasSpeed()) {
-            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Spd = %.1f km/h ", mLocation.getSpeed() * 3.6f);
+        if (location.hasSpeed()) {
+            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Spd = %.1f km/h ", location.getSpeed() * 3.6f);
             noInfo = false;
         }
-        if (mLocation.hasAltitude()) {
-            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Alt = %.0f m ", mLocation.getAltitude());
+        if (location.hasAltitude()) {
+            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Alt = %.0f m ", location.getAltitude());
             noInfo = false;
         }
-        if (mLocation.hasAccuracy()) {
-            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Acc = %.0f m", mLocation.getAccuracy());
+        if (location.hasAccuracy()) {
+            desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Acc = %.0f m", location.getAccuracy());
         }
 
         if (noInfo) {
@@ -225,31 +231,31 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     @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