From fa063cbb9b8089caf6c70ebdc3b2234ea5b5868c Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 23 Nov 2010 09:58:50 -0800
Subject: [PATCH 1/2] Move Dev Tools icon to mipmap

So that the different icon densities don't get stripped out of the build
by aapt, move it to the mipmap directory.

This will ensure that any program using the getDrawableByDensity API can
read any density/size of the icon needed.

Change-Id: I8ee4f7233358be4d68133b20090323251511677a
---
 apps/Development/AndroidManifest.xml                |   4 ++--
 .../ic_launcher_devtools.png                        | Bin
 .../ic_launcher_devtools.png                        | Bin
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename apps/Development/res/{drawable-hdpi => mipmap-hdpi}/ic_launcher_devtools.png (100%)
 rename apps/Development/res/{drawable-mdpi => mipmap-mdpi}/ic_launcher_devtools.png (100%)

diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 827b57a7c..c91e21be3 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -44,12 +44,12 @@
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.YouTubeUser" />
 
     <application android:label="Dev Tools"
-            android:icon="@drawable/ic_launcher_devtools">
+            android:icon="@mipmap/ic_launcher_devtools">
 
         <uses-library android:name="android.test.runner" />
 
         <activity android:name="Development" android:label="Dev Tools"
-            android:icon="@drawable/ic_launcher_devtools">
+            android:icon="@mipmap/ic_launcher_devtools">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/apps/Development/res/drawable-hdpi/ic_launcher_devtools.png b/apps/Development/res/mipmap-hdpi/ic_launcher_devtools.png
similarity index 100%
rename from apps/Development/res/drawable-hdpi/ic_launcher_devtools.png
rename to apps/Development/res/mipmap-hdpi/ic_launcher_devtools.png
diff --git a/apps/Development/res/drawable-mdpi/ic_launcher_devtools.png b/apps/Development/res/mipmap-mdpi/ic_launcher_devtools.png
similarity index 100%
rename from apps/Development/res/drawable-mdpi/ic_launcher_devtools.png
rename to apps/Development/res/mipmap-mdpi/ic_launcher_devtools.png

From e2243480c37aa479fee3d2ca366415a38ca8a050 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 23 Nov 2010 09:58:50 -0800
Subject: [PATCH 2/2] Move Spare Parts icon to mipmap

So that the different icon densities don't get stripped out of the build
by aapt, move it to the mipmap directory.

This will ensure that any program using the getDrawableByDensity API can
read any density/size of the icon needed.

Change-Id: I48c27f7a8b115365c5827ddaa9e8710f3b81358e
---
 apps/SpareParts/AndroidManifest.xml                 |   2 +-
 .../res/{drawable-hdpi => mipmap-hdpi}/app_icon.png | Bin
 .../res/{drawable-mdpi => mipmap-mdpi}/app_icon.png | Bin
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename apps/SpareParts/res/{drawable-hdpi => mipmap-hdpi}/app_icon.png (100%)
 rename apps/SpareParts/res/{drawable-mdpi => mipmap-mdpi}/app_icon.png (100%)

diff --git a/apps/SpareParts/AndroidManifest.xml b/apps/SpareParts/AndroidManifest.xml
index 85de7a4ff..137f9073a 100644
--- a/apps/SpareParts/AndroidManifest.xml
+++ b/apps/SpareParts/AndroidManifest.xml
@@ -21,7 +21,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     
     <application android:label="@string/app_label"
-            android:icon="@drawable/app_icon">
+            android:icon="@mipmap/app_icon">
 
         <activity android:name="SpareParts">
             <intent-filter>
diff --git a/apps/SpareParts/res/drawable-hdpi/app_icon.png b/apps/SpareParts/res/mipmap-hdpi/app_icon.png
similarity index 100%
rename from apps/SpareParts/res/drawable-hdpi/app_icon.png
rename to apps/SpareParts/res/mipmap-hdpi/app_icon.png
diff --git a/apps/SpareParts/res/drawable-mdpi/app_icon.png b/apps/SpareParts/res/mipmap-mdpi/app_icon.png
similarity index 100%
rename from apps/SpareParts/res/drawable-mdpi/app_icon.png
rename to apps/SpareParts/res/mipmap-mdpi/app_icon.png