Merge "Ensure that the configuration bar is visible"

2 files changed, 11 insertions, 1 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java
index ea66ac4..750c192 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java
@@ -537,6 +537,8 @@ public class ConfigurationChooser extends Composite
                     selectConfiguration(mConfiguration.getEditedConfig());
                     updateActivity();
                 }
+            } else if (sdkStatus == LoadStatus.FAILED) {
+                setVisible(true);
             }
         } finally {
             mDisableUpdates--;
@@ -808,6 +810,8 @@ public class ConfigurationChooser extends Composite
 
                     // compute the final current config
                     mConfiguration.syncFolderConfig();
+                } else if (targetStatus == LoadStatus.FAILED) {
+                    setVisible(true);
                 }
             } finally {
                 mDisableUpdates--;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreview.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreview.java
index 78e670e..95722c5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreview.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreview.java
@@ -505,11 +505,17 @@ public class RenderPreview implements IJobChangeListener {
 
     /** Render immediately */
     private void renderSync() {
+        GraphicalEditorPart editor = mCanvas.getEditorDelegate().getGraphicalEditor();
+        if (editor.getReadyLayoutLib(false /*displayError*/) == null) {
+            // Don't attempt to render when there is no ready layout library: most likely
+            // the targets are loading/reloading.
+            return;
+        }
+
         disposeThumbnail();
 
         Configuration configuration =
                 mAlternateInput != null ? mAlternateConfiguration : mConfiguration;
-        GraphicalEditorPart editor = mCanvas.getEditorDelegate().getGraphicalEditor();
         ResourceResolver resolver = getResourceResolver(configuration);
         RenderService renderService = RenderService.create(editor, configuration, resolver);