Use @mipmap instead of @drawable for launcher icons
Change-Id: I712196a8c810930bbd88dffc17dcae5bb69f89d7
diff --git a/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl b/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl
index cc6c0fe..d23fc63 100644
--- a/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl
+++ b/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl
@@ -25,14 +25,14 @@
to="${escapeXmlAttribute(projectOut)}/proguard-rules.pro" />
</#if>
<mkdir at="${escapeXmlAttribute(resOut)}/drawable" />
- <copy from="res/drawable-hdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-hdpi" />
- <copy from="res/drawable-mdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-mdpi" />
- <copy from="res/drawable-xhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xhdpi" />
- <copy from="res/drawable-xxhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xxhdpi" />
+ <copy from="res/mipmap-hdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-hdpi" />
+ <copy from="res/mipmap-mdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-mdpi" />
+ <copy from="res/mipmap-xhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xhdpi" />
+ <copy from="res/mipmap-xxhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xxhdpi" />
<instantiate from="res/values/strings.xml.ftl"
to="${escapeXmlAttribute(resOut)}/values/strings.xml" />
diff --git a/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl b/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl
index a9b1b5f..c43f9e4 100644
--- a/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl
+++ b/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl
@@ -3,7 +3,7 @@
<uses-feature android:name="android.hardware.type.watch" />
<application android:allowBackup="true"
android:label="@string/app_name"
- android:icon="@drawable/ic_launcher"
+ android:icon="@mipmap/ic_launcher"
android:theme="@android:style/Theme.DeviceDefault">
</application>
diff --git a/templates/gradle-projects/AndroidWearModule/root/res/drawable-hdpi/ic_launcher.png b/templates/gradle-projects/AndroidWearModule/root/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/AndroidWearModule/root/res/drawable-hdpi/ic_launcher.png
rename to templates/gradle-projects/AndroidWearModule/root/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/AndroidWearModule/root/res/drawable-mdpi/ic_launcher.png b/templates/gradle-projects/AndroidWearModule/root/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/AndroidWearModule/root/res/drawable-mdpi/ic_launcher.png
rename to templates/gradle-projects/AndroidWearModule/root/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/AndroidWearModule/root/res/drawable-xhdpi/ic_launcher.png b/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/AndroidWearModule/root/res/drawable-xhdpi/ic_launcher.png
rename to templates/gradle-projects/AndroidWearModule/root/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/AndroidWearModule/root/res/drawable-xxhdpi/ic_launcher.png b/templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/AndroidWearModule/root/res/drawable-xxhdpi/ic_launcher.png
rename to templates/gradle-projects/AndroidWearModule/root/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl b/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl
index 05fb108..e7345b0 100644
--- a/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl
+++ b/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl
@@ -19,14 +19,14 @@
<mkdir at="${escapeXmlAttribute(resOut)}/drawable" />
<#if copyIcons && !isLibraryProject>
- <copy from="res/drawable-hdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-hdpi" />
- <copy from="res/drawable-mdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-mdpi" />
- <copy from="res/drawable-xhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xhdpi" />
- <copy from="res/drawable-xxhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xxhdpi" />
+ <copy from="res/mipmap-hdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-hdpi" />
+ <copy from="res/mipmap-mdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-mdpi" />
+ <copy from="res/mipmap-xhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xhdpi" />
+ <copy from="res/mipmap-xxhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xxhdpi" />
</#if>
<#if makeIgnore>
<copy from="module_ignore"
diff --git a/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl b/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl
index d70e453..22ba868 100644
--- a/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl
+++ b/templates/gradle-projects/NewAndroidModule/root/AndroidManifest.xml.ftl
@@ -3,7 +3,7 @@
<application <#if minApiLevel gte 4 && buildApi gte 4>android:allowBackup="true"</#if>
android:label="@string/app_name"<#if copyIcons && !isLibraryProject>
- android:icon="@drawable/ic_launcher"<#elseif assetName??>
+ android:icon="@mipmap/ic_launcher"<#elseif assetName??>
android:icon="@drawable/${assetName}"</#if>
<#if baseTheme != "none" && !isLibraryProject>
android:theme="@style/AppTheme"</#if>>
diff --git a/templates/gradle-projects/NewAndroidModule/root/res/drawable-hdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidModule/root/res/drawable-hdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidModule/root/res/drawable-mdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidModule/root/res/drawable-mdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidModule/root/res/drawable-xhdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidModule/root/res/drawable-xhdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidModule/root/res/drawable-xxhdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidModule/root/res/drawable-xxhdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl b/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl
index de21e1d6..1f0c822 100644
--- a/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl
+++ b/templates/gradle-projects/NewAndroidTVModule/recipe.xml.ftl
@@ -15,14 +15,14 @@
<#if copyIcons>
<mkdir at="${escapeXmlAttribute(resOut)}/drawable" />
- <copy from="res/drawable-hdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-hdpi" />
- <copy from="res/drawable-mdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-mdpi" />
- <copy from="res/drawable-xhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xhdpi" />
- <copy from="res/drawable-xxhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xxhdpi" />
+ <copy from="res/mipmap-hdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-hdpi" />
+ <copy from="res/mipmap-mdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-mdpi" />
+ <copy from="res/mipmap-xhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xhdpi" />
+ <copy from="res/mipmap-xxhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xxhdpi" />
</#if>
<#if makeIgnore>
<copy from="module_ignore"
diff --git a/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl b/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl
index 047924b..e793724 100644
--- a/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl
+++ b/templates/gradle-projects/NewAndroidTVModule/root/AndroidManifest.xml.ftl
@@ -3,7 +3,7 @@
<application android:allowBackup="true"
android:label="@string/app_name"<#if copyIcons>
- android:icon="@drawable/ic_launcher"<#else>
+ android:icon="@mipmap/ic_launcher"<#else>
android:icon="@drawable/${assetName}"</#if>
android:theme="@style/Theme.Leanback">
diff --git a/templates/gradle-projects/NewAndroidTVModule/root/res/drawable-hdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidTVModule/root/res/drawable-hdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidTVModule/root/res/drawable-mdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidTVModule/root/res/drawable-mdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidTVModule/root/res/drawable-xhdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidTVModule/root/res/drawable-xhdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewAndroidTVModule/root/res/drawable-xxhdpi/ic_launcher.png b/templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewAndroidTVModule/root/res/drawable-xxhdpi/ic_launcher.png
rename to templates/gradle-projects/NewAndroidTVModule/root/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewGlassModule/recipe.xml.ftl b/templates/gradle-projects/NewGlassModule/recipe.xml.ftl
index 184cbf1..4896c9d 100644
--- a/templates/gradle-projects/NewGlassModule/recipe.xml.ftl
+++ b/templates/gradle-projects/NewGlassModule/recipe.xml.ftl
@@ -13,14 +13,14 @@
<#if copyIcons>
<mkdir at="${escapeXmlAttribute(resOut)}/drawable" />
- <copy from="res/drawable-hdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-hdpi" />
- <copy from="res/drawable-mdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-mdpi" />
- <copy from="res/drawable-xhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xhdpi" />
- <copy from="res/drawable-xxhdpi"
- to="${escapeXmlAttribute(resOut)}/drawable-xxhdpi" />
+ <copy from="res/mipmap-hdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-hdpi" />
+ <copy from="res/mipmap-mdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-mdpi" />
+ <copy from="res/mipmap-xhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xhdpi" />
+ <copy from="res/mipmap-xxhdpi"
+ to="${escapeXmlAttribute(resOut)}/mipmap-xxhdpi" />
</#if>
<#if makeIgnore>
<copy from="module_ignore"
diff --git a/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl b/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl
index 6257e4f..1f5b625 100644
--- a/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl
+++ b/templates/gradle-projects/NewGlassModule/root/AndroidManifest.xml.ftl
@@ -3,7 +3,7 @@
<application android:allowBackup="true"
android:label="@string/app_name"<#if copyIcons>
- android:icon="@drawable/ic_launcher"<#else>
+ android:icon="@mipmap/ic_launcher"<#else>
android:icon="@drawable/${assetName}"</#if>
android:theme="@style/AppTheme">
diff --git a/templates/gradle-projects/NewGlassModule/root/res/drawable-hdpi/ic_launcher.png b/templates/gradle-projects/NewGlassModule/root/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewGlassModule/root/res/drawable-hdpi/ic_launcher.png
rename to templates/gradle-projects/NewGlassModule/root/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewGlassModule/root/res/drawable-mdpi/ic_launcher.png b/templates/gradle-projects/NewGlassModule/root/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewGlassModule/root/res/drawable-mdpi/ic_launcher.png
rename to templates/gradle-projects/NewGlassModule/root/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewGlassModule/root/res/drawable-xhdpi/ic_launcher.png b/templates/gradle-projects/NewGlassModule/root/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewGlassModule/root/res/drawable-xhdpi/ic_launcher.png
rename to templates/gradle-projects/NewGlassModule/root/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/templates/gradle-projects/NewGlassModule/root/res/drawable-xxhdpi/ic_launcher.png b/templates/gradle-projects/NewGlassModule/root/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from templates/gradle-projects/NewGlassModule/root/res/drawable-xxhdpi/ic_launcher.png
rename to templates/gradle-projects/NewGlassModule/root/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ