tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4396 - UserLocationView Refactor fix tests

Browse Source
This commit is contained in:
Tobrun
2016-04-21 09:05:07 +02:00
parent b7c4919e7f
commit 452c892dab
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
View File

@@ -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;
}

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
View File

@@ -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;
}
}

4
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
View File

@@ -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() {