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

Tran Thuong Tien · Tran Thuong Tien · commit 54a0e6524404 · 2017-07-10T11:18:51.000+02:00
* release-ios-v3.6.0-android-v5.1.0: [android] - invible marker views performance fix mapbox#9419 (mapbox#9420)
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
@@ -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);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public void updateMarkerViewsPosition() {`
`214`	`214`	`// ensure view is measured first`
`215`	`215`	`// #6805 invalidate marker views to ensure convertView width and height`
`216`	`216`	`// values are properly measured and up to date`
`217`		`- if (marker.getWidth() == 0) {`
	`217`	`+ if (marker.getWidth() == 0 && marker.isVisible()) {`
`218`	`218`	`convertView.getViewTreeObserver().addOnPreDrawListener(markerViewPreDrawObserver);`
`219`	`219`	`}`
`220`	`220`	`}`