diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-13 17:04:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-13 17:04:02 +0200 |
commit | 1898df606dd6ca3c8badcaa40cb17c2bce307055 (patch) | |
tree | 5cdeb1dfef24b48c479869389693427593f4e8f1 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations | |
parent | b722d5c3a914fc1fe7552e1bec38da677d09e2a1 (diff) | |
download | qtlocation-mapboxgl-1898df606dd6ca3c8badcaa40cb17c2bce307055.tar.gz |
[android] - add transparent image for MarkerViews ghosting SymbolAnnotations (#6675)
* [android] - add transparent image to core for MarkerView ghosting SymbolAnnotations. Removes logging messages: `Can't find sprite ... `. Cleanup MapView.
* [android] - use alpha_8 config to only allocate one byte, rename id for better readability.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations')
2 files changed, 6 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java index 93c6deddc9..56c1b643a1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java @@ -24,11 +24,14 @@ import java.io.InputStream; /** * Factory for creating {@link Icon} objects. + * * @see Icon */ public final class IconFactory { private static final String ICON_ID_PREFIX = "com.mapbox.icons.icon_"; + public static final Bitmap ICON_MARKERVIEW_BITMAP = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8); + public static final String ICON_MARKERVIEW_ID = ICON_ID_PREFIX + "marker_view"; private Context mContext; private static IconFactory sInstance; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java index b1008e290b..5c84fb9992 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.annotations; -import android.graphics.Bitmap; import android.support.annotation.FloatRange; import android.support.annotation.Nullable; @@ -302,10 +301,10 @@ public class MarkerView extends Marker { @Override public void setIcon(@Nullable Icon icon) { if (icon != null) { - markerViewIcon = IconFactory.recreate("icon", icon.getBitmap()); + markerViewIcon = IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID, icon.getBitmap()); } - Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888); - Icon transparentIcon = IconFactory.recreate("markerViewSettings", bitmap); + Icon transparentIcon = IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID, + IconFactory.ICON_MARKERVIEW_BITMAP); if (markerViewManager != null) { markerViewManager.updateIcon(this); } |