Cherrypick 025af8 from master. do not merge.

Update Asset Studio launcher icon stencils per UX spec

Per discussion with the Android UX team, we've decided to update the
spec for launcher icons. In a future update we will change some of
the underlying behavior to provide more shapes and allow freeform
shapes.

Change-Id: I8dcdd5884d093fd4a7713c5796dd2dc83784be83

diff --git a/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java b/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
index 66cb6ae..2f76b2d 100644 (file)
--- a/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
+++ b/assetstudio/src/com/android/assetstudiolib/LauncherIconGenerator.java
@@ -30,18 +30,18 @@ import java.util.Map;
 public class LauncherIconGenerator extends GraphicGenerator {
     private static final Rectangle IMAGE_SIZE_HDPI = new Rectangle(0, 0, 72, 72);
     /* TODO: Adapt from html version:
-          'square-web-targetRect': { x: 57, y: 57, w: 398, h: 398 },
-          'circle-web-targetRect': { x: 42, y: 42, w: 428, h: 428 },
-        'square-xhdpi-targetRect': { x: 11, y: 11, w:  74, h:  74 },
-        'circle-xhdpi-targetRect': { x:  8, y:  8, w:  80, h:  80 },
-         'square-hdpi-targetRect': { x:  8, y:  8, w:  56, h:  56 },
-         'circle-hdpi-targetRect': { x:  6, y:  6, w:  60, h:  60 }, <====
-         'square-mdpi-targetRect': { x:  5, y:  5, w:  38, h:  38 },
-         'circle-mdpi-targetRect': { x:  4, y:  4, w:  40, h:  40 },
-         'square-ldpi-targetRect': { x:  4, y:  4, w:  28, h:  28 },
-         'circle-ldpi-targetRect': { x:  3, y:  3, w:  30, h:  30 }
+          'square-web-targetRect': { x: 21, y: 21, w: 470, h: 470 },
+          'circle-web-targetRect': { x: 21, y: 21, w: 470, h: 470 },
+        'square-xhdpi-targetRect': { x:  4, y:  4, w:  88, h:  88 },
+        'circle-xhdpi-targetRect': { x:  4, y:  4, w:  88, h:  88 },
+         'square-hdpi-targetRect': { x:  3, y:  3, w:  66, h:  66 },
+         'circle-hdpi-targetRect': { x:  3, y:  3, w:  66, h:  66 }, <====
+         'square-mdpi-targetRect': { x:  2, y:  2, w:  44, h:  44 },
+         'circle-mdpi-targetRect': { x:  2, y:  2, w:  44, h:  44 },
+         'square-ldpi-targetRect': { x:  1, y:  1, w:  34, h:  34 },
+         'circle-ldpi-targetRect': { x:  1, y:  1, w:  34, h:  34 }
      */
-    private static final Rectangle TARGET_RECT_HDPI = new Rectangle(6, 6, 60, 60);
+    private static final Rectangle TARGET_RECT_HDPI = new Rectangle(3, 3, 66, 66);
 
     @Override
     public BufferedImage generate(GraphicGeneratorContext context, Options options) {

diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png
index 8e3dbc1..8379315 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png and b/assetstudio/src/images/launcher_stencil/circle/hdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png
index 79d75c0..b9037d5 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/circle/hdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png
index 99e787a..7af0262 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png and b/assetstudio/src/images/launcher_stencil/circle/hdpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png
index d9a9fcc..62e2272 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png and b/assetstudio/src/images/launcher_stencil/circle/ldpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png
index ecc3bc5..f2d4589 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png and b/assetstudio/src/images/launcher_stencil/circle/ldpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png
index e537ad0..e711d32 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png and b/assetstudio/src/images/launcher_stencil/circle/ldpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png
index e165038..0e10b2a 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png and b/assetstudio/src/images/launcher_stencil/circle/mdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png
index c42af13..ea6dc3c 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/circle/mdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png
index 19f18bf..3b69a4e 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png and b/assetstudio/src/images/launcher_stencil/circle/mdpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/web/back.png b/assetstudio/src/images/launcher_stencil/circle/web/back.png
index 191c677..5bc9eb0 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/web/back.png and b/assetstudio/src/images/launcher_stencil/circle/web/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/web/fore1.png b/assetstudio/src/images/launcher_stencil/circle/web/fore1.png
index 7ea8096..a7f0a80 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/web/fore1.png and b/assetstudio/src/images/launcher_stencil/circle/web/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/web/mask.png b/assetstudio/src/images/launcher_stencil/circle/web/mask.png
index 8316d80..8cfa053 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/web/mask.png and b/assetstudio/src/images/launcher_stencil/circle/web/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png
index e655af6..0b42ebf 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png and b/assetstudio/src/images/launcher_stencil/circle/xhdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png
index 639ccba..6c55c7e 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/circle/xhdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png
index 6dc3bc7..02535c7 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png and b/assetstudio/src/images/launcher_stencil/circle/xhdpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/back.png b/assetstudio/src/images/launcher_stencil/square/hdpi/back.png
index 3e58211..2318f1b 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/hdpi/back.png and b/assetstudio/src/images/launcher_stencil/square/hdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png
index e76d493..49dd5fe 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/square/hdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png
index 9c56fe6..bd5d05d 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png and b/assetstudio/src/images/launcher_stencil/square/hdpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/back.png b/assetstudio/src/images/launcher_stencil/square/ldpi/back.png
index 1a68be3..6d2d60f 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/ldpi/back.png and b/assetstudio/src/images/launcher_stencil/square/ldpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png
index c46e1c2..b692c16 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png and b/assetstudio/src/images/launcher_stencil/square/ldpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png b/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png
index 04d6d1a..454efc7 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png and b/assetstudio/src/images/launcher_stencil/square/ldpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/back.png b/assetstudio/src/images/launcher_stencil/square/mdpi/back.png
index f49e513..8473cf4 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/mdpi/back.png and b/assetstudio/src/images/launcher_stencil/square/mdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png
index 2837d41..bd8d9f9 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/square/mdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png
index 90e5cd0..c336dee 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png and b/assetstudio/src/images/launcher_stencil/square/mdpi/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/web/back.png b/assetstudio/src/images/launcher_stencil/square/web/back.png
index 2f008b7..ef5ad78 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/web/back.png and b/assetstudio/src/images/launcher_stencil/square/web/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/web/fore1.png b/assetstudio/src/images/launcher_stencil/square/web/fore1.png
index 527ac47..8bb3619 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/web/fore1.png and b/assetstudio/src/images/launcher_stencil/square/web/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/web/mask.png b/assetstudio/src/images/launcher_stencil/square/web/mask.png
index 2c80196..0bb9314 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/web/mask.png and b/assetstudio/src/images/launcher_stencil/square/web/mask.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png
index 84caac0..9456d23 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png and b/assetstudio/src/images/launcher_stencil/square/xhdpi/back.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png
index 2d237e1..3fac0ce 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png and b/assetstudio/src/images/launcher_stencil/square/xhdpi/fore1.png differ

diff --git a/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png
index 9e0bbdc..331cdca 100644 (file)
Binary files a/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png and b/assetstudio/src/images/launcher_stencil/square/xhdpi/mask.png differ