Merge branch 'release-ios-v3.6.0-android-v5.1.0' into merge_mapbox_v5_1

* release-ios-v3.6.0-android-v5.1.0: [android] - invible marker views performance fix mapbox#9419 (mapbox#9420)
Mappy · Jul 10, 2017 · 54a0e65 · 54a0e65
2 parents c8456d3 + eb7926d
commit 54a0e65
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.../MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/.../MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -214,7 +214,7 @@ public void updateMarkerViewsPosition() {
           // ensure view is measured first
           // #6805 invalidate marker views to ensure convertView width and height
           // values are properly measured and up to date
-          if (marker.getWidth() == 0) {
+          if (marker.getWidth() == 0 && marker.isVisible()) {
             convertView.getViewTreeObserver().addOnPreDrawListener(markerViewPreDrawObserver);
           }
         }