1 files changed, 11 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index b17350f4f4..1c2f8e59c5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -185,25 +185,23 @@ public class MapView extends FrameLayout {
     }
 
     private void initialize(@NonNull Context context, @NonNull MapboxMapOptions options) {
+        if (isInEditMode()) {
+            // if we are in an editor mode we show an image of a map
+            LayoutInflater.from(context).inflate(R.layout.mapview_preview, this);
+            return;
+        }
+
         mInitialLoad = true;
         mOnMapReadyCallbackList = new ArrayList<>();
         mOnMapChangedListener = new CopyOnWriteArrayList<>();
         mMapboxMap = new MapboxMap(this);
         mIcons = new ArrayList<>();
         View view = LayoutInflater.from(context).inflate(R.layout.mapview_internal, this);
-
-        if (!isInEditMode()) {
-            setWillNotDraw(false);
-        }
+        setWillNotDraw(false);
 
         // Reference the TextureView
         SurfaceView surfaceView = (SurfaceView) view.findViewById(R.id.surfaceView);
 
-        // Check if we are in Android Studio UI editor to avoid error in layout preview
-        if (isInEditMode()) {
-            return;
-        }
-
         mNativeMapView = new NativeMapView(this);
 
         // Ensure this view is interactable
@@ -1506,6 +1504,10 @@ public class MapView extends FrameLayout {
     // Called when view is hidden and shown
     @Override
     protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
+        if (isInEditMode()) {
+            return;
+        }
+
         // Required by ZoomButtonController (from Android SDK documentation)
         if (mMapboxMap.getUiSettings().isZoomControlsEnabled() && (visibility != View.VISIBLE)) {
             mZoomButtonsController.setVisible(false);