1 files changed, 6 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java
index 60e9920..c92ce81 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java
@@ -265,7 +265,7 @@ public class PreviewIconFactory {
 
                 session = RenderService.create(editor)
                     .setModel(model)
-                    .setSize(width, height)
+                    .setOverrideRenderSize(width, height)
                     .setRenderingMode(RenderingMode.FULL_EXPAND)
                     .setLog(new RenderLogger("palette"))
                     .setOverrideBgColor(overrideBgColor)
@@ -377,11 +377,15 @@ public class PreviewIconFactory {
      *
      * @return a pair of possibly null color descriptions
      */
+    @NonNull
     private Pair<RGB, RGB> getColorsFromTheme() {
         RGB background = null;
         RGB foreground = null;
 
         ResourceResolver resources = mPalette.getEditor().getResourceResolver();
+        if (resources == null) {
+            return Pair.of(background, foreground);
+        }
         StyleResourceValue theme = resources.getCurrentTheme();
         if (theme != null) {
             background = resolveThemeColor(resources, "windowBackground"); //$NON-NLS-1$
@@ -436,7 +440,7 @@ public class PreviewIconFactory {
         ResourceResolver resources = editor.getResourceResolver();
         ResourceValue resourceValue = resources.findItemInTheme(themeItemName);
         BufferedImage image = RenderService.create(editor)
-            .setSize(100, 100)
+            .setOverrideRenderSize(100, 100)
             .renderDrawable(resourceValue);
         if (image != null) {
             // Use the middle pixel as the color since that works better for gradients;