Update Asset Studio launcher and icon generators. Also removes LDPI.

This change updates the Asset Studio launcher icon generator to the new visual
style described in the Android Design guidelines. It also adds XXHDPI icon
creation for launcher icons, which is important for some newer devices such as
Nexus 10.

The change also removes shape selection for notification icons, since this only
affected pre-Gingerbread devices. Pre-Gingerbread icons are still generated,
but they now always have a square shape for simplicity.

Finally, this change removes LDPI for all icon generators. LDPI is much less
relevant today than it was a few years ago, and allowing platform scaling
of MDPI resources is normally an acceptable alternative to providing LDPI
specific resources.

Change-Id: I65afc5b38b25170604cf69ba355816288d30d6d5

134 files changed, 94 insertions, 59 deletions

diff --git a/assetstudio/.classpath b/assetstudio/.classpath
index d10330f..bee5c09 100644
--- a/assetstudio/.classpath
+++ b/assetstudio/.classpath
@@ -6,5 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk
index 35943f2..88f4987 100644
--- a/assetstudio/Android.mk
+++ b/assetstudio/Android.mk
@@ -21,6 +21,7 @@ LOCAL_JAVA_RESOURCE_DIRS := src
 
 # TODO: Replace common with the batik stuff
 LOCAL_JAVA_LIBRARIES := \
+	common \
 	guava-tools \
 	layoutlib_api
 
diff --git a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
index 91b2d2e..706adc8 100644
--- a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
+++ b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
@@ -160,7 +160,8 @@ public abstract class GraphicGenerator {
             if (!density.isValidValueForDevice()) {
                 continue;
             }
-            if (density == Density.TV || density == Density.XXHIGH) {
+            if (density == Density.LOW || density == Density.TV ||
+                    (density == Density.XXHIGH && !(this instanceof LauncherIconGenerator))) {
                 // TODO don't manually check and instead gracefully handle missing stencils.
                 // Not yet supported -- missing stencil image
                 continue;
diff --git a/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java b/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
index b3e327b..8902774 100644
--- a/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
+++ b/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
@@ -16,6 +16,9 @@
 
 package com.android.assetstudiolib;
 
+import com.android.resources.Density;
+import com.android.utils.Pair;
+
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -28,8 +31,34 @@ import java.util.Map;
  * A {@link GraphicGenerator} that generates Android "launcher" icons.
  */
 public class LauncherIconGenerator extends GraphicGenerator {
+    private static final Rectangle IMAGE_SIZE_WEB = new Rectangle(0, 0, 512, 512);
     private static final Rectangle IMAGE_SIZE_MDPI = new Rectangle(0, 0, 48, 48);
-    private static final Rectangle TARGET_RECT_MDPI = new Rectangle(2, 2, 44, 44);
+
+    private static final Map<Pair<Shape, Density>, Rectangle> TARGET_RECTS
+            = new HashMap<Pair<Shape, Density>, Rectangle>();
+
+    static {
+        // None, Web
+        TARGET_RECTS.put(Pair.of(Shape.NONE, (Density) null), new Rectangle(32, 32, 448, 448));
+        // None, HDPI
+        TARGET_RECTS.put(Pair.of(Shape.NONE, Density.HIGH), new Rectangle(4, 4, 64, 64));
+        // None, MDPI
+        TARGET_RECTS.put(Pair.of(Shape.NONE, Density.MEDIUM), new Rectangle(3, 3, 42, 42));
+
+        // Circle, Web
+        TARGET_RECTS.put(Pair.of(Shape.CIRCLE, (Density) null), new Rectangle(32, 43, 448, 448));
+        // Circle, HDPI
+        TARGET_RECTS.put(Pair.of(Shape.CIRCLE, Density.HIGH), new Rectangle(4, 6, 64, 64));
+        // Circle, MDPI
+        TARGET_RECTS.put(Pair.of(Shape.CIRCLE, Density.MEDIUM), new Rectangle(3, 4, 42, 42));
+
+        // Square, Web
+        TARGET_RECTS.put(Pair.of(Shape.SQUARE, (Density) null), new Rectangle(32, 53, 448, 427));
+        // Square, HDPI
+        TARGET_RECTS.put(Pair.of(Shape.SQUARE, Density.HIGH), new Rectangle(4, 8, 64, 60));
+        // Square, MDPI
+        TARGET_RECTS.put(Pair.of(Shape.SQUARE, Density.MEDIUM), new Rectangle(3, 5, 42, 40));
+    }
 
     @Override
     public BufferedImage generate(GraphicGeneratorContext context, Options options) {
@@ -41,51 +70,69 @@ public class LauncherIconGenerator extends GraphicGenerator {
         } else {
             density = launcherOptions.density.getResourceValue();
         }
-        String shape = launcherOptions.shape.id;
-        BufferedImage mBackImage = null;
-        BufferedImage mForeImage = null;
-        BufferedImage mMaskImage = null;
-        if (launcherOptions.shape != Shape.NONE) {
-            mBackImage = context.loadImageResource("/images/launcher_stencil/"
-                + shape + "/" + density + "/back.png");
-            mForeImage = context.loadImageResource("/images/launcher_stencil/"
-                + shape + "/" + density + "/" + launcherOptions.style.id + ".png");
-            mMaskImage = context.loadImageResource("/images/launcher_stencil/"
-                + shape + "/" + density + "/mask.png");
+
+        BufferedImage backImage = null, foreImage = null, maskImage = null, maskInnerImage = null;
+        if (launcherOptions.shape != Shape.NONE && launcherOptions.shape != null) {
+            String shape = launcherOptions.shape.id;
+            backImage = context.loadImageResource("/images/launcher_stencil/"
+                    + shape + "/" + density + "/back.png");
+            foreImage = context.loadImageResource("/images/launcher_stencil/"
+                    + shape + "/" + density + "/" + launcherOptions.style.id + ".png");
+            maskImage = context.loadImageResource("/images/launcher_stencil/"
+                    + shape + "/" + density + "/mask.png");
+            maskInnerImage = context.loadImageResource("/images/launcher_stencil/"
+                    + shape + "/" + density + "/mask_inner.png");
         }
 
-        float scaleFactor = GraphicGenerator.getMdpiScaleFactor(launcherOptions.density);
-        if (launcherOptions.isWebGraphic) {
-            // Target size for the web graphic is 512
-            scaleFactor = 512 / (float) IMAGE_SIZE_MDPI.height;
+        Rectangle imageRect = IMAGE_SIZE_WEB;
+        if (!launcherOptions.isWebGraphic) {
+            imageRect = Util.scaleRectangle(IMAGE_SIZE_MDPI,
+                    GraphicGenerator.getMdpiScaleFactor(launcherOptions.density));
+        }
+
+        Rectangle targetRect = TARGET_RECTS.get(
+                Pair.of(launcherOptions.shape, launcherOptions.density));
+        if (targetRect == null) {
+            // Scale up from MDPI if no density-specific target rectangle is defined.
+            targetRect = Util.scaleRectangle(
+                    TARGET_RECTS.get(Pair.of(launcherOptions.shape, Density.MEDIUM)),
+                    GraphicGenerator.getMdpiScaleFactor(launcherOptions.density));
         }
-        Rectangle imageRect = Util.scaleRectangle(IMAGE_SIZE_MDPI, scaleFactor);
-        Rectangle targetRect = Util.scaleRectangle(TARGET_RECT_MDPI, scaleFactor);
 
         BufferedImage outImage = Util.newArgbBufferedImage(imageRect.width, imageRect.height);
         Graphics2D g = (Graphics2D) outImage.getGraphics();
-        if (mBackImage != null) {
-            g.drawImage(mBackImage, 0, 0, null);
+        if (backImage != null) {
+            g.drawImage(backImage, 0, 0, null);
         }
 
         BufferedImage tempImage = Util.newArgbBufferedImage(imageRect.width, imageRect.height);
         Graphics2D g2 = (Graphics2D) tempImage.getGraphics();
-        if (mMaskImage != null) {
-            g2.drawImage(mMaskImage, 0, 0, null);
+        if (maskImage != null) {
+            g2.drawImage(maskImage, 0, 0, null);
             g2.setComposite(AlphaComposite.SrcAtop);
             g2.setPaint(new Color(launcherOptions.backgroundColor));
             g2.fillRect(0, 0, imageRect.width, imageRect.height);
         }
 
+        BufferedImage tempImage2 = Util.newArgbBufferedImage(imageRect.width, imageRect.height);
+        Graphics2D g3 = (Graphics2D) tempImage2.getGraphics();
+        if (maskInnerImage != null) {
+            g3.drawImage(maskInnerImage, 0, 0, null);
+            g3.setComposite(AlphaComposite.SrcAtop);
+            g3.setPaint(new Color(launcherOptions.backgroundColor));
+            g3.fillRect(0, 0, imageRect.width, imageRect.height);
+        }
+
         if (launcherOptions.crop) {
-            Util.drawCenterCrop(g2, launcherOptions.sourceImage, targetRect);
+            Util.drawCenterCrop(g3, launcherOptions.sourceImage, targetRect);
         } else {
-            Util.drawCenterInside(g2, launcherOptions.sourceImage, targetRect);
+            Util.drawCenterInside(g3, launcherOptions.sourceImage, targetRect);
         }
 
+        g2.drawImage(tempImage2, 0, 0, null);
         g.drawImage(tempImage, 0, 0, null);
-        if (mForeImage != null) {
-            g.drawImage(mForeImage, 0, 0, null);
+        if (foreImage != null) {
+            g.drawImage(foreImage, 0, 0, null);
         }
 
         g.dispose();
@@ -104,6 +151,7 @@ public class LauncherIconGenerator extends GraphicGenerator {
 
         if (generateWebImage) {
             launcherOptions.isWebGraphic = true;
+            launcherOptions.density = null;
             BufferedImage image = generate(context, options);
             if (image != null) {
                 Map<String, BufferedImage> imageMap = new HashMap<String, BufferedImage>();
diff --git a/assetstudio/src/com/android/assetstudiolib/NotificationIconGenerator.java b/assetstudio/src/com/android/assetstudiolib/NotificationIconGenerator.java
index b4aa6a6..b84af1b 100644
--- a/assetstudio/src/com/android/assetstudiolib/NotificationIconGenerator.java
+++ b/assetstudio/src/com/android/assetstudiolib/NotificationIconGenerator.java
@@ -63,12 +63,11 @@ public class NotificationIconGenerator extends GraphicGenerator {
         Graphics2D g2 = (Graphics2D) tempImage.getGraphics();
 
         if (notificationOptions.version == Version.OLDER) {
-            BufferedImage mBackImage = context.loadImageResource(
+            BufferedImage backImage = context.loadImageResource(
                     "/images/notification_stencil/"
-                            + notificationOptions.shape.id + '/' +
-                            notificationOptions.density.getResourceValue()
+                            + notificationOptions.density.getResourceValue()
                             + ".png");
-            g.drawImage(mBackImage, 0, 0, null);
+            g.drawImage(backImage, 0, 0, null);
             BufferedImage top = options.sourceImage;
             BufferedImage filled = Util.filledImage(top, Color.WHITE);
             Util.drawCenterInside(g, filled, targetRect);
@@ -138,11 +137,6 @@ public class NotificationIconGenerator extends GraphicGenerator {
      */
     public static class NotificationOptions extends GraphicGenerator.Options {
         /**
-         * The shape to use for graphics behind the icon (for {@link Version#OLDER} only)
-         */
-        public Shape shape = Shape.SQUARE;
-
-        /**
          * The version of the icon to generate - different styles are used for different
          * versions of Android
          */
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png
index 8379315..5401258 100644
--- a/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png
index b9037d5..6295083 100644
--- a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore2.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore2.png
deleted file mode 100644
index 594257a..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore3.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore3.png
deleted file mode 100644
index 65fb48b..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png
index 7af0262..7d10568 100644
--- a/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask_inner.png
new file mode 100644
index 0000000..3cbd8de
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png
deleted file mode 100644
index 62e2272..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png
deleted file mode 100644
index f2d4589..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore2.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/fore2.png
deleted file mode 100644
index c86b59c..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore3.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/fore3.png
deleted file mode 100644
index 1ae4d31..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png
deleted file mode 100644
index e711d32..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png
index 0e10b2a..73a640f 100644
--- a/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png
index ea6dc3c..90a9e47 100644
--- a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore2.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore2.png
deleted file mode 100644
index 0c06821..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore3.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore3.png
deleted file mode 100644
index 01fe418..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png
index 3b69a4e..107082b 100644
--- a/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask_inner.png
new file mode 100644
index 0000000..c44b167
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/back.png b/assetstudio/src/images/launcher_stencil/circle/web/back.png
index 5bc9eb0..2058604 100644
--- a/assetstudio/src/images/launcher_stencil/circle/web/back.png
+++ b/assetstudio/src/images/launcher_stencil/circle/web/back.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/fore1.png b/assetstudio/src/images/launcher_stencil/circle/web/fore1.png
index a7f0a80..b80d804 100644
--- a/assetstudio/src/images/launcher_stencil/circle/web/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/circle/web/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/fore2.png b/assetstudio/src/images/launcher_stencil/circle/web/fore2.png
deleted file mode 100644
index 5a76240..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/web/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/fore3.png b/assetstudio/src/images/launcher_stencil/circle/web/fore3.png
deleted file mode 100644
index 1794bff..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/web/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/mask.png b/assetstudio/src/images/launcher_stencil/circle/web/mask.png
index 8cfa053..709060e 100644
--- a/assetstudio/src/images/launcher_stencil/circle/web/mask.png
+++ b/assetstudio/src/images/launcher_stencil/circle/web/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/web/mask_inner.png b/assetstudio/src/images/launcher_stencil/circle/web/mask_inner.png
new file mode 100644
index 0000000..dca886c
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/web/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png
index 0b42ebf..4fd8b7d 100644
--- a/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png
index 6c55c7e..c0d752b 100644
--- a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore2.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore2.png
deleted file mode 100644
index b922452..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore3.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore3.png
deleted file mode 100644
index 5f1c15e..0000000
--- a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png
index 02535c7..a0bfc98 100644
--- a/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask_inner.png
new file mode 100644
index 0000000..02bc806
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xxhdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/back.png
new file mode 100644
index 0000000..8b62d02
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xxhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/fore1.png
new file mode 100644
index 0000000..2e4ab8c
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask.png
new file mode 100644
index 0000000..874aa5b
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask_inner.png
new file mode 100644
index 0000000..819c144
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/circle/xxhdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/back.png b/assetstudio/src/images/launcher_stencil/square/hdpi/back.png
index 2318f1b..284a785 100644
--- a/assetstudio/src/images/launcher_stencil/square/hdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/square/hdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png
index 49dd5fe..e7faa71 100644
--- a/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/fore2.png b/assetstudio/src/images/launcher_stencil/square/hdpi/fore2.png
deleted file mode 100644
index ab28d8d..0000000
--- a/assetstudio/src/images/launcher_stencil/square/hdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/fore3.png b/assetstudio/src/images/launcher_stencil/square/hdpi/fore3.png
deleted file mode 100644
index 59f5e8f..0000000
--- a/assetstudio/src/images/launcher_stencil/square/hdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png
index bd5d05d..fe1aa7a 100644
--- a/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/square/hdpi/mask_inner.png
new file mode 100644
index 0000000..28df306
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/hdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/back.png b/assetstudio/src/images/launcher_stencil/square/ldpi/back.png
deleted file mode 100644
index 6d2d60f..0000000
--- a/assetstudio/src/images/launcher_stencil/square/ldpi/back.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png
deleted file mode 100644
index b692c16..0000000
--- a/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/fore2.png b/assetstudio/src/images/launcher_stencil/square/ldpi/fore2.png
deleted file mode 100644
index 3bc8315..0000000
--- a/assetstudio/src/images/launcher_stencil/square/ldpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/fore3.png b/assetstudio/src/images/launcher_stencil/square/ldpi/fore3.png
deleted file mode 100644
index 0bfa4f7..0000000
--- a/assetstudio/src/images/launcher_stencil/square/ldpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png b/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png
deleted file mode 100644
index 454efc7..0000000
--- a/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/back.png b/assetstudio/src/images/launcher_stencil/square/mdpi/back.png
index 8473cf4..849a656 100644
--- a/assetstudio/src/images/launcher_stencil/square/mdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/square/mdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png
index bd8d9f9..cef3e48 100644
--- a/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/fore2.png b/assetstudio/src/images/launcher_stencil/square/mdpi/fore2.png
deleted file mode 100644
index 566941f..0000000
--- a/assetstudio/src/images/launcher_stencil/square/mdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/fore3.png b/assetstudio/src/images/launcher_stencil/square/mdpi/fore3.png
deleted file mode 100644
index 9bcfc5e..0000000
--- a/assetstudio/src/images/launcher_stencil/square/mdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png
index c336dee..8b3d0a2 100644
--- a/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/square/mdpi/mask_inner.png
new file mode 100644
index 0000000..3f3ad9b
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/mdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/square/web/back.png b/assetstudio/src/images/launcher_stencil/square/web/back.png
index ef5ad78..bb59979 100644
--- a/assetstudio/src/images/launcher_stencil/square/web/back.png
+++ b/assetstudio/src/images/launcher_stencil/square/web/back.png
diff --git a/assetstudio/src/images/launcher_stencil/square/web/fore1.png b/assetstudio/src/images/launcher_stencil/square/web/fore1.png
index 8bb3619..2a3be1c 100644
--- a/assetstudio/src/images/launcher_stencil/square/web/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/square/web/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/square/web/fore2.png b/assetstudio/src/images/launcher_stencil/square/web/fore2.png
deleted file mode 100644
index 5e557f8..0000000
--- a/assetstudio/src/images/launcher_stencil/square/web/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/web/fore3.png b/assetstudio/src/images/launcher_stencil/square/web/fore3.png
deleted file mode 100644
index 58d85af..0000000
--- a/assetstudio/src/images/launcher_stencil/square/web/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/web/mask.png b/assetstudio/src/images/launcher_stencil/square/web/mask.png
index 0bb9314..e3f10a3 100644
--- a/assetstudio/src/images/launcher_stencil/square/web/mask.png
+++ b/assetstudio/src/images/launcher_stencil/square/web/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/square/web/mask_inner.png b/assetstudio/src/images/launcher_stencil/square/web/mask_inner.png
new file mode 100644
index 0000000..ea15b03
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/web/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png
index 9456d23..1338f7c 100644
--- a/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png
+++ b/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png
index 3fac0ce..90c3430 100644
--- a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png
+++ b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore2.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore2.png
deleted file mode 100644
index cce5e0e..0000000
--- a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore2.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore3.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore3.png
deleted file mode 100644
index 3b91aa4..0000000
--- a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore3.png
+++ /dev/null
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png
index 331cdca..7291db1 100644
--- a/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png
+++ b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask_inner.png
new file mode 100644
index 0000000..388a4c2
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask_inner.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xxhdpi/back.png b/assetstudio/src/images/launcher_stencil/square/xxhdpi/back.png
new file mode 100644
index 0000000..068e28f
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/xxhdpi/back.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xxhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/xxhdpi/fore1.png
new file mode 100644
index 0000000..099b135
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/xxhdpi/fore1.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask.png
new file mode 100644
index 0000000..be26125
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask.png
diff --git a/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask_inner.png b/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask_inner.png
new file mode 100644
index 0000000..3f8c5ea
--- /dev/null
+++ b/assetstudio/src/images/launcher_stencil/square/xxhdpi/mask_inner.png
diff --git a/assetstudio/src/images/notification_stencil/circle/hdpi.png b/assetstudio/src/images/notification_stencil/circle/hdpi.png
deleted file mode 100644
index 4d28710..0000000
--- a/assetstudio/src/images/notification_stencil/circle/hdpi.png
+++ /dev/null
diff --git a/assetstudio/src/images/notification_stencil/circle/ldpi.png b/assetstudio/src/images/notification_stencil/circle/ldpi.png
deleted file mode 100644
index 5c9a9f7..0000000
--- a/assetstudio/src/images/notification_stencil/circle/ldpi.png
+++ /dev/null
diff --git a/assetstudio/src/images/notification_stencil/circle/mdpi.png b/assetstudio/src/images/notification_stencil/circle/mdpi.png
deleted file mode 100644
index 1f064a2..0000000
--- a/assetstudio/src/images/notification_stencil/circle/mdpi.png
+++ /dev/null
diff --git a/assetstudio/src/images/notification_stencil/circle/xhdpi.png b/assetstudio/src/images/notification_stencil/circle/xhdpi.png
deleted file mode 100644
index f6a57c1..0000000
--- a/assetstudio/src/images/notification_stencil/circle/xhdpi.png
+++ /dev/null
diff --git a/assetstudio/src/images/notification_stencil/square/hdpi.png b/assetstudio/src/images/notification_stencil/hdpi.png
index f755f4f..f755f4f 100644
--- a/assetstudio/src/images/notification_stencil/square/hdpi.png
+++ b/assetstudio/src/images/notification_stencil/hdpi.png
diff --git a/assetstudio/src/images/notification_stencil/square/mdpi.png b/assetstudio/src/images/notification_stencil/mdpi.png
index 5f80247..5f80247 100644
--- a/assetstudio/src/images/notification_stencil/square/mdpi.png
+++ b/assetstudio/src/images/notification_stencil/mdpi.png
diff --git a/assetstudio/src/images/notification_stencil/square/ldpi.png b/assetstudio/src/images/notification_stencil/square/ldpi.png
deleted file mode 100644
index 23846bd..0000000
--- a/assetstudio/src/images/notification_stencil/square/ldpi.png
+++ /dev/null
diff --git a/assetstudio/src/images/notification_stencil/square/xhdpi.png b/assetstudio/src/images/notification_stencil/xhdpi.png
index 7c27d82..7c27d82 100644
--- a/assetstudio/src/images/notification_stencil/square/xhdpi.png
+++ b/assetstudio/src/images/notification_stencil/xhdpi.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/ActionBarIconGeneratorTest.java b/assetstudio/tests/src/com/android/assetstudiolib/ActionBarIconGeneratorTest.java
index ed5ea04..a097f0a 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/ActionBarIconGeneratorTest.java
+++ b/assetstudio/tests/src/com/android/assetstudiolib/ActionBarIconGeneratorTest.java
@@ -28,7 +28,7 @@ public class ActionBarIconGeneratorTest extends GeneratorTest {
         options.theme = theme;
 
         ActionBarIconGenerator generator = new ActionBarIconGenerator();
-        checkGraphic(4, "actions", baseName, generator, options);
+        checkGraphic(3, "actions", baseName, generator, options);
     }
 
     public void testDark() throws Exception {
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/MenuIconGeneratorTest.java b/assetstudio/tests/src/com/android/assetstudiolib/MenuIconGeneratorTest.java
index 700be4b..544777d 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/MenuIconGeneratorTest.java
+++ b/assetstudio/tests/src/com/android/assetstudiolib/MenuIconGeneratorTest.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 public class MenuIconGeneratorTest extends GeneratorTest {
     private void checkGraphic(String baseName) throws IOException {
         MenuIconGenerator generator = new MenuIconGenerator();
-        checkGraphic(4, "menus", baseName, generator, new GraphicGenerator.Options());
+        checkGraphic(3, "menus", baseName, generator, new GraphicGenerator.Options());
     }
 
     public void testMenu() throws Exception {
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/NotificationIconGeneratorTest.java b/assetstudio/tests/src/com/android/assetstudiolib/NotificationIconGeneratorTest.java
index d65498a..39fd7ac 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/NotificationIconGeneratorTest.java
+++ b/assetstudio/tests/src/com/android/assetstudiolib/NotificationIconGeneratorTest.java
@@ -22,35 +22,28 @@ import java.io.IOException;
 
 @SuppressWarnings("javadoc")
 public class NotificationIconGeneratorTest extends GeneratorTest {
-    private void checkGraphic(String baseName,
-            GraphicGenerator.Shape shape, int minSdk, String folderName,
+    private void checkGraphic(String baseName, int minSdk, String folderName,
             int expectedCount) throws IOException {
         NotificationOptions options = new NotificationOptions();
-        options.shape = shape;
         options.minSdk = minSdk;
 
         NotificationIconGenerator generator = new NotificationIconGenerator();
         checkGraphic(expectedCount, folderName, baseName, generator, options);
     }
 
-    private void checkGraphic(String baseName, GraphicGenerator.Shape shape) throws IOException {
-        checkGraphic(baseName, shape, 1, "notification", 12);
+    private void checkGraphic(String baseName) throws IOException {
+        checkGraphic(baseName, 1, "notification", 9);
     }
 
     public void testNotification1() throws Exception {
-        checkGraphic("ic_stat_circle", GraphicGenerator.Shape.CIRCLE);
+        checkGraphic("ic_stat_1");
     }
 
     public void testNotification2() throws Exception {
-        checkGraphic("ic_stat_square", GraphicGenerator.Shape.SQUARE);
+        checkGraphic("ic_stat_1", 9 /* minSdk */, "notification-v9+", 6 /* fileCount */);
     }
 
     public void testNotification3() throws Exception {
-        checkGraphic("ic_stat_circle", GraphicGenerator.Shape.CIRCLE, 9 /* minSdk*/,
-                "notification-v9+", 8 /*fileCount*/);
-    }
-
-    public void testNotification4() throws Exception {
-        checkGraphic("ic_stat_circle", GraphicGenerator.Shape.CIRCLE, 11, "notification-v11+", 4);
+        checkGraphic("ic_stat_1", 11, "notification-v11+", 3);
     }
 }
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/TabIconGeneratorTest.java b/assetstudio/tests/src/com/android/assetstudiolib/TabIconGeneratorTest.java
index 4231f54..fb7849c 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/TabIconGeneratorTest.java
+++ b/assetstudio/tests/src/com/android/assetstudiolib/TabIconGeneratorTest.java
@@ -29,10 +29,10 @@ public class TabIconGeneratorTest extends GeneratorTest {
     }
 
     public void testTabs1() throws Exception {
-        checkGraphic("tabs", "ic_tab_1", 1 /* minSdk */, 16 /* expectedFileCount */);
+        checkGraphic("tabs", "ic_tab_1", 1 /* minSdk */, 12 /* expectedFileCount */);
     }
 
     public void testTabs2() throws Exception {
-        checkGraphic("tabs-v5+", "ic_tab_1", 5, 8);
+        checkGraphic("tabs-v5+", "ic_tab_1", 5, 6);
     }
 }
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_dark.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_dark.png
deleted file mode 100644
index a529137..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_dark.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_light.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_light.png
deleted file mode 100644
index c9ee211..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/actions/res/drawable-ldpi/ic_action_light.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/red_simple_circle-web.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/red_simple_circle-web.png
index 37e7ecd..7805116 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/red_simple_circle-web.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/red_simple_circle-web.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-hdpi/red_simple_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-hdpi/red_simple_circle.png
index 4e3387c..6fdf98e 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-hdpi/red_simple_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-hdpi/red_simple_circle.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-ldpi/red_simple_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-ldpi/red_simple_circle.png
deleted file mode 100644
index 2f47b53..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-ldpi/red_simple_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-mdpi/red_simple_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-mdpi/red_simple_circle.png
index fb6e5b1..18a677f 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-mdpi/red_simple_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-mdpi/red_simple_circle.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xhdpi/red_simple_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xhdpi/red_simple_circle.png
index 5447df6..85de4ee 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xhdpi/red_simple_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xhdpi/red_simple_circle.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xxhdpi/red_simple_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xxhdpi/red_simple_circle.png
new file mode 100644
index 0000000..5670c8c
--- /dev/null
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/launcher/res/drawable-xxhdpi/red_simple_circle.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/menus/res/drawable-ldpi/ic_menu_1.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/menus/res/drawable-ldpi/ic_menu_1.png
deleted file mode 100644
index 85655ed..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/menus/res/drawable-ldpi/ic_menu_1.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-hdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-hdpi/ic_stat_1.png
index 4273bef..4273bef 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-hdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-hdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-ldpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-ldpi/ic_stat_circle.png
deleted file mode 100644
index 384c670..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-ldpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-mdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-mdpi/ic_stat_1.png
index c8994f5..c8994f5 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-mdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-mdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-xhdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-xhdpi/ic_stat_1.png
index 1643eba..1643eba 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-xhdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v11+/res/drawable-xhdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi-v11/ic_stat_1.png
index 4273bef..4273bef 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi/ic_stat_1.png
index 2fc269b..2fc269b 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-hdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi-v11/ic_stat_circle.png
deleted file mode 100644
index 384c670..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi-v11/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi/ic_stat_circle.png
deleted file mode 100644
index d0d2464..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-ldpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi-v11/ic_stat_1.png
index c8994f5..c8994f5 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi/ic_stat_1.png
index 524e31a..524e31a 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-mdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi-v11/ic_stat_1.png
index 1643eba..1643eba 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi/ic_stat_1.png
index 8b24336..8b24336 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification-v9+/res/drawable-xhdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_1.png
index 4273bef..4273bef 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_square.png
deleted file mode 100644
index 4273bef..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v11/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_1.png
index 2fc269b..2fc269b 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_square.png
deleted file mode 100644
index 2fc269b..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi-v9/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_1.png
index a1c9285..a1c9285 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_square.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_circle.png
deleted file mode 100644
index d2ea9f5..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-hdpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_circle.png
deleted file mode 100644
index 384c670..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_square.png
deleted file mode 100644
index 384c670..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v11/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_circle.png
deleted file mode 100644
index d0d2464..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_square.png
deleted file mode 100644
index d0d2464..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi-v9/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_circle.png
deleted file mode 100644
index c315dff..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_square.png
deleted file mode 100644
index 8592c1f..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-ldpi/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_1.png
index c8994f5..c8994f5 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_square.png
deleted file mode 100644
index c8994f5..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v11/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_1.png
index 524e31a..524e31a 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_square.png
deleted file mode 100644
index 524e31a..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi-v9/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_1.png
index 40b27af..40b27af 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_square.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_circle.png
deleted file mode 100644
index c63fc8f..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-mdpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_1.png
index 1643eba..1643eba 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_square.png
deleted file mode 100644
index 1643eba..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v11/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_1.png
index 8b24336..8b24336 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_circle.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_square.png
deleted file mode 100644
index 8b24336..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi-v9/ic_stat_square.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_square.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_1.png
index c7159ec..c7159ec 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_square.png
+++ b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_1.png
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_circle.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_circle.png
deleted file mode 100644
index d05fbff..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/notification/res/drawable-xhdpi/ic_stat_circle.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_selected.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_selected.png
deleted file mode 100644
index 1d79c30..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_selected.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_unselected.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_unselected.png
deleted file mode 100644
index 4ed95d7..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi-v5/ic_tab_1_unselected.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_selected.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_selected.png
deleted file mode 100644
index d097015..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_selected.png
+++ /dev/null
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_unselected.png b/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_unselected.png
deleted file mode 100644
index c2d0e5f..0000000
--- a/assetstudio/tests/src/com/android/assetstudiolib/testdata/tabs/res/drawable-ldpi/ic_tab_1_unselected.png
+++ /dev/null
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/AssetType.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/AssetType.java
index 3e2bd67..5cfeebb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/AssetType.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/AssetType.java
@@ -68,7 +68,7 @@ public enum AssetType {
 
     /** Whether this asset type needs a shape parameter */
     boolean needsShape() {
-        return this == LAUNCHER || this == NOTIFICATION;
+        return this == LAUNCHER;
     }
 
     /** Whether this asset type needs foreground and background color parameters */
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java
index d0d328e..17336ad 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java
@@ -105,7 +105,7 @@ public class ConfigureAssetSetPage extends WizardPage implements SelectionListen
         ModifyListener {
     private final CreateAssetSetWizardState mValues;
 
-    private static final int PREVIEW_AREA_WIDTH = 120;
+    private static final int PREVIEW_AREA_WIDTH = 144;
 
     private boolean mShown;
 
@@ -1148,10 +1148,7 @@ public class ConfigureAssetSetPage extends WizardPage implements SelectionListen
             }
             case NOTIFICATION: {
                 generator = new NotificationIconGenerator();
-                NotificationIconGenerator.NotificationOptions notificationOptions =
-                        new NotificationIconGenerator.NotificationOptions();
-                notificationOptions.shape = mValues.shape;
-                options = notificationOptions;
+                options = new NotificationIconGenerator.NotificationOptions();
                 break;
             }
             case TAB: