1 files changed, 25 insertions, 31 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 d910a19d5d..5ebe43e68c 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
@@ -125,41 +125,35 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     setCheckBoxes();
 
-    mapboxMap.setOnMyLocationTrackingModeChangeListener(new MapboxMap.OnMyLocationTrackingModeChangeListener() {
-      @Override
-      public void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode) {
-        locationSpinner.setOnItemSelectedListener(null);
-        switch (myLocationTrackingMode) {
-          case MyLocationTracking.TRACKING_NONE:
-            locationSpinner.setSelection(TRACKING_NONE_INDEX);
-            break;
-          case MyLocationTracking.TRACKING_FOLLOW:
-            locationSpinner.setSelection(TRACKING_FOLLOW_INDEX);
-            break;
-        }
-        locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+    mapboxMap.setOnMyLocationTrackingModeChangeListener(myLocationTrackingMode -> {
+      locationSpinner.setOnItemSelectedListener(null);
+      switch (myLocationTrackingMode) {
+        case MyLocationTracking.TRACKING_NONE:
+          locationSpinner.setSelection(TRACKING_NONE_INDEX);
+          break;
+        case MyLocationTracking.TRACKING_FOLLOW:
+          locationSpinner.setSelection(TRACKING_FOLLOW_INDEX);
+          break;
       }
+      locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     });
 
-    mapboxMap.setOnMyBearingTrackingModeChangeListener(new MapboxMap.OnMyBearingTrackingModeChangeListener() {
-      @Override
-      public void onMyBearingTrackingModeChange(@MyBearingTracking.Mode int myBearingTrackingMode) {
-        bearingSpinner.setOnItemSelectedListener(null);
-        switch (myBearingTrackingMode) {
-          case MyBearingTracking.NONE:
-            bearingSpinner.setSelection(BEARING_NONE_INDEX);
-            break;
-
-          case MyBearingTracking.GPS:
-            bearingSpinner.setSelection(BEARING_GPS_INDEX);
-            break;
-
-          case MyBearingTracking.COMPASS:
-            bearingSpinner.setSelection(BEARING_COMPASS_INDEX);
-            break;
-        }
-        bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+    mapboxMap.setOnMyBearingTrackingModeChangeListener(myBearingTrackingMode -> {
+      bearingSpinner.setOnItemSelectedListener(null);
+      switch (myBearingTrackingMode) {
+        case MyBearingTracking.NONE:
+          bearingSpinner.setSelection(BEARING_NONE_INDEX);
+          break;
+
+        case MyBearingTracking.GPS:
+          bearingSpinner.setSelection(BEARING_GPS_INDEX);
+          break;
+
+        case MyBearingTracking.COMPASS:
+          bearingSpinner.setSelection(BEARING_COMPASS_INDEX);
+          break;
       }
+      bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     });
   }