From 452c892dab253e3df49f017651a9b8010ad7048c Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Thu, 21 Apr 2016 09:05:07 +0200
Subject: [PATCH] [android] #4396 - UserLocationView Refactor fix tests

---
 .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java  |  2 +-
 .../mapbox/mapboxsdk/maps/TrackingSettings.java    | 14 +++++++-------
 .../maps/widgets/MyLocationViewSettings.java       |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 2df391c7f..fabfe3c51 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -198,7 +198,7 @@ public class MapboxMap {
      */
     public MyLocationViewSettings getMyLocationViewSettings() {
         if (myLocationViewSettings == null) {
-            myLocationViewSettings = new MyLocationViewSettings(mMapView);
+            myLocationViewSettings = new MyLocationViewSettings(mMapView,mMapView.getUserLocationView());
         }
         return myLocationViewSettings;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
index af9e10602..2151de5fc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
@@ -18,10 +18,10 @@ public class TrackingSettings {
     private boolean dismissBearingTrackingOnGesture = true;
 
     @MyLocationTracking.Mode
-    private int mMyLocationTrackingMode;
+    private int myLocationTrackingMode;
 
     @MyBearingTracking.Mode
-    private int mMyBearingTrackingMode;
+    private int myBearingTrackingMode;
 
     TrackingSettings(@NonNull MapView mapView, UiSettings uiSettings) {
         this.mapView = mapView;
@@ -43,7 +43,7 @@ public class TrackingSettings {
      */
     @UiThread
     public void setMyLocationTrackingMode(@MyLocationTracking.Mode int myLocationTrackingMode) {
-        mMyLocationTrackingMode = myLocationTrackingMode;
+        this.myLocationTrackingMode = myLocationTrackingMode;
         mapView.setMyLocationTrackingMode(myLocationTrackingMode);
         validateGesturesForLocationTrackingMode();
     }
@@ -58,7 +58,7 @@ public class TrackingSettings {
     @UiThread
     @MyLocationTracking.Mode
     public int getMyLocationTrackingMode() {
-        return mMyLocationTrackingMode;
+        return myLocationTrackingMode;
     }
 
     /**
@@ -78,7 +78,7 @@ public class TrackingSettings {
      */
     @UiThread
     public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) {
-        mMyBearingTrackingMode = myBearingTrackingMode;
+        this.myBearingTrackingMode = myBearingTrackingMode;
         mapView.setMyBearingTrackingMode(myBearingTrackingMode);
         validateGesturesForBearingTrackingMode();
     }
@@ -93,7 +93,7 @@ public class TrackingSettings {
     @UiThread
     @MyBearingTracking.Mode
     public int getMyBearingTrackingMode() {
-        return mMyBearingTrackingMode;
+        return myBearingTrackingMode;
     }
 
     /**
@@ -172,6 +172,6 @@ public class TrackingSettings {
      * @return True if location tracking is disabled.
      */
     public boolean isLocationTrackingDisabled(){
-        return mMyLocationTrackingMode == MyLocationTracking.TRACKING_NONE;
+        return myLocationTrackingMode == MyLocationTracking.TRACKING_NONE;
     }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
index ca95dbc7d..af9c82df8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
@@ -53,9 +53,9 @@ public class MyLocationViewSettings {
 
     private int[] padding = new int[4];
 
-    public MyLocationViewSettings(MapView mapView) {
+    public MyLocationViewSettings(MapView mapView, UserLocationView userLocationView) {
         this.mapView = mapView;
-        this.userLocationView = (UserLocationView) mapView.findViewById(R.id.userLocationView);
+        this.userLocationView = userLocationView;
     }
 
     public boolean isEnabled() {