diff options
| author | Tobrun <tobrun@mapbox.com> | 2016-05-03 14:22:52 +0200 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2016-05-03 14:22:52 +0200 |
| commit | 65adb9eadf81eae3cc3cc49158e306047b6d0d48 (patch) | |
| tree | 7821dd6c0bf4e88125a3a5cb53dfaef4d8689b42 | |
| parent | ee75d1847396482e6c4613994da45f75f11ca19c (diff) | |
| download | qtlocation-mapboxgl-65adb9eadf81eae3cc3cc49158e306047b6d0d48.tar.gz | |
[android] #4912 - remove lollipop attribute from background drawable, made default bg color white, revert default color to TRANSPARENT when reading attributes.
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index a9ead8001c..f9f6953dbe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -174,7 +174,7 @@ public class MapboxMapOptions implements Parcelable { mapboxMapOptions.locationEnabled(typedArray.getBoolean(R.styleable.MapView_my_location_enabled, false)); mapboxMapOptions.myLocationForegroundTintColor(typedArray.getColor(R.styleable.MapView_my_location_foreground_tint, Color.TRANSPARENT)); - mapboxMapOptions.myLocationBackgroundTintColor(typedArray.getColor(R.styleable.MapView_my_location_background_tint, Color.WHITE)); + mapboxMapOptions.myLocationBackgroundTintColor(typedArray.getColor(R.styleable.MapView_my_location_background_tint, Color.TRANSPARENT)); Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.MapView_my_location_foreground); if(foregroundDrawable==null){ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml index 7601d1b4a8..e1df60788e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml @@ -2,7 +2,7 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - <solid android:color="?attr/colorPrimaryDark" /> + <solid android:color="@color/white" /> <size android:width="@dimen/my_locationview_outer_circle" |