From 4b0fe7f14bb36769ef30c59c407bd6ed5b3d5cf7 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Fri, 11 Dec 2015 15:05:46 +0000 Subject: [PATCH] Use RenderDrawable to render mipmaps Bug: http://b.android.com/179714 Change-Id: If05e71b33ee3a95590eb892f4fffbff4cfca1867 --- .../layoutlib/bridge/impl/RenderDrawable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java index 26f9000ad9454..d797eecad3dd4 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java @@ -42,10 +42,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - /** * Action to render a given Drawable provided through {@link DrawableParams#getDrawable()}. * @@ -72,8 +68,12 @@ public class RenderDrawable extends RenderAction { BridgeContext context = getContext(); drawableResource = context.getRenderResources().resolveResValue(drawableResource); - if (drawableResource == null || - drawableResource.getResourceType() != ResourceType.DRAWABLE) { + if (drawableResource == null) { + return Status.ERROR_NOT_A_DRAWABLE.createResult(); + } + + ResourceType resourceType = drawableResource.getResourceType(); + if (resourceType != ResourceType.DRAWABLE && resourceType != ResourceType.MIPMAP) { return Status.ERROR_NOT_A_DRAWABLE.createResult(); }