diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-08-29 14:50:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 14:50:52 +0200 |
| commit | 4db99d20247b1592f09be4e3c3b971e49c6bd3a2 (patch) | |
| tree | 2c3be182a038f6a5d48915f9ef202255885d278a /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations | |
| parent | e759f1c948ab3ec4cd8b2e1b2a515b799449e924 (diff) | |
| download | qtlocation-mapboxgl-4db99d20247b1592f09be4e3c3b971e49c6bd3a2.tar.gz | |
[android] alpha not applied from builder fix for marker view (#6152)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations')
2 files changed, 3 insertions, 4 deletions
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 a577550635..04bf05a820 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 @@ -61,6 +61,7 @@ public class MarkerView extends Marker { */ public MarkerView(BaseMarkerViewOptions baseMarkerViewOptions) { super(baseMarkerViewOptions); + this.alpha = baseMarkerViewOptions.getAlpha(); this.anchorU = baseMarkerViewOptions.getAnchorU(); this.anchorV = baseMarkerViewOptions.getAnchorV(); this.infoWindowAnchorU = baseMarkerViewOptions.getInfoWindowAnchorU(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java index eb6d6d6647..4742c9b66c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java @@ -118,7 +118,7 @@ public class MarkerViewManager { PointF point = mapboxMap.getProjection().toScreenLocation(marker.getPosition()); if (marker.getOffsetX() == MapboxConstants.UNMEASURED) { // ensure view is measured first - if (convertView.getMeasuredWidth() == 0) { + if (convertView.getWidth() == 0) { convertView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); } if (convertView.getMeasuredWidth() != 0) { @@ -133,9 +133,7 @@ public class MarkerViewManager { // animate visibility if (marker.isVisible() && convertView.getVisibility() == View.GONE) { - convertView.animate().cancel(); - convertView.setAlpha(0); - AnimatorUtils.alpha(convertView, 1); + animateVisible(marker, true); } } } |