diff options
author | Pablo Guardiola <guardiola31337@gmail.com> | 2017-04-10 12:47:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-10 12:47:07 +0200 |
commit | df22b614af2cf8d468d5e6fe3fcae129b5b95df0 (patch) | |
tree | 425794c365d7f414ec09a9b001803ac89eabc12c /platform/android/MapboxGLAndroidSDK/src | |
parent | 3172a9744f2e296d9e8a68558e11c884c9c30aca (diff) | |
download | qtlocation-mapboxgl-df22b614af2cf8d468d5e6fe3fcae129b5b95df0.tar.gz |
add compass drawable initialization in ui settings (#8695)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src')
2 files changed, 6 insertions, 1 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 2fd02c76e5..8fcfdd6db0 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 @@ -14,6 +14,7 @@ import android.support.annotation.IntRange; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; import android.util.AttributeSet; import android.view.Gravity; @@ -217,7 +218,7 @@ public class MapboxMapOptions implements Parcelable { Drawable compassDrawable = typedArray.getDrawable( R.styleable.mapbox_MapView_mapbox_uiCompassDrawable); if (compassDrawable == null) { - compassDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_compass_icon); + compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.mapbox_compass_icon, null); } mapboxMapOptions.compassImage(compassDrawable); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index bcb4ca4afc..354a42536a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -15,6 +15,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; import android.view.Gravity; import android.view.View; import android.widget.FrameLayout; @@ -149,6 +150,9 @@ public final class UiSettings { setCompassMargins(tenDp, tenDp, tenDp, tenDp); } setCompassFadeFacingNorth(options.getCompassFadeFacingNorth()); + if (options.getCompassImage() == null) { + options.compassImage(ResourcesCompat.getDrawable(resources, R.drawable.mapbox_compass_icon, null)); + } setCompassImage(options.getCompassImage()); } |