From 8935b15cbb21ef1023cfe62203a0d98249ffe264 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 23 Nov 2010 12:03:43 -0800
Subject: Move icons to mipmap.

Change-Id: If3bd32658300cb028411d1aa7a3f56d8c1d234eb
---
 AndroidManifest.xml                          |   2 +-
 res/drawable-hdpi/ic_launcher_settings.png   | Bin 7529 -> 0 bytes
 res/drawable-mdpi/ic_launcher_settings.png   | Bin 4166 -> 0 bytes
 res/layout/settings_actionbar.xml            |   2 +-
 res/mipmap-hdpi/ic_launcher_settings.png     | Bin 0 -> 7529 bytes
 res/mipmap-mdpi/ic_launcher_settings.png     | Bin 0 -> 4166 bytes
 src/com/android/settings/CreateShortcut.java |   2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_launcher_settings.png
 delete mode 100644 res/drawable-mdpi/ic_launcher_settings.png
 create mode 100644 res/mipmap-hdpi/ic_launcher_settings.png
 create mode 100644 res/mipmap-mdpi/ic_launcher_settings.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38579b6..1638c90 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
     <uses-permission android:name="android.permission.MOVE_PACKAGE" />
 
     <application android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
+            android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
             android:hardwareAccelerated="true">
 
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
deleted file mode 100644
index ff34a7f..0000000
Binary files a/res/drawable-hdpi/ic_launcher_settings.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
deleted file mode 100644
index a8cddf3..0000000
Binary files a/res/drawable-mdpi/ic_launcher_settings.png and /dev/null differ
diff --git a/res/layout/settings_actionbar.xml b/res/layout/settings_actionbar.xml
index 6388025..711a0a1 100644
--- a/res/layout/settings_actionbar.xml
+++ b/res/layout/settings_actionbar.xml
@@ -23,7 +23,7 @@
         android:layout_height="match_parent">
 
     <!-- ImageView
-            android:src="@drawable/ic_launcher_settings"
+            android:src="@mipmap/ic_launcher_settings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..ff34a7f
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_settings.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..a8cddf3
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_settings.png differ
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 5ca6370..0312a4b 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -38,7 +38,7 @@ public class CreateShortcut extends LauncherActivity {
         shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings));
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_settings));
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         setResult(RESULT_OK, intent);
-- 
cgit v1.1