diff options
author | Tobrun <tobrun@mapbox.com> | 2016-04-21 09:05:07 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2016-04-23 07:16:37 +0200 |
commit | 452c892dab253e3df49f017651a9b8010ad7048c (patch) | |
tree | d1f4a197ca90fbe3cfc0f07dc807eeeaaa3e2dea /platform/android/MapboxGLAndroidSDK/src/main | |
parent | b7c4919e7f1fe44ff5b023866f70520e83142882 (diff) | |
download | qtlocation-mapboxgl-452c892dab253e3df49f017651a9b8010ad7048c.tar.gz |
[android] #4396 - UserLocationView Refactor fix tests
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
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 2df391c7ff..fabfe3c519 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 af9e10602f..2151de5fc4 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 ca95dbc7df..af9c82df80 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() { |