From 79697cb903422de8b7290506471a1a128325b82b Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 23 Nov 2010 11:17:46 -0800
Subject: Move icons to mipmap.

Change-Id: If6356ccfe3ae6b791f82157488b9a78c1724cef6
---
 AndroidManifest.xml                                      |   4 ++--
 res/drawable-hdpi/ic_launcher_browser.png                | Bin 7531 -> 0 bytes
 .../ic_launcher_shortcut_browser_bookmark.png            | Bin 3328 -> 0 bytes
 res/drawable-mdpi/ic_launcher_browser.png                | Bin 4142 -> 0 bytes
 .../ic_launcher_shortcut_browser_bookmark.png            | Bin 2160 -> 0 bytes
 res/layout/bookmarklistwidget.xml                        |   2 +-
 res/mipmap-hdpi/ic_launcher_browser.png                  | Bin 0 -> 7531 bytes
 .../ic_launcher_shortcut_browser_bookmark.png            | Bin 0 -> 3328 bytes
 res/mipmap-mdpi/ic_launcher_browser.png                  | Bin 0 -> 4142 bytes
 .../ic_launcher_shortcut_browser_bookmark.png            | Bin 0 -> 2160 bytes
 src/com/android/browser/BookmarkUtils.java               |   4 ++--
 11 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_launcher_browser.png
 delete mode 100644 res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png
 delete mode 100755 res/drawable-mdpi/ic_launcher_browser.png
 delete mode 100644 res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png
 create mode 100644 res/mipmap-hdpi/ic_launcher_browser.png
 create mode 100644 res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png
 create mode 100755 res/mipmap-mdpi/ic_launcher_browser.png
 create mode 100644 res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9fea44a..b653461 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,7 +39,7 @@
 
     <application   android:name="Browser"
                    android:label="@string/application_name"
-                   android:icon="@drawable/ic_launcher_browser"
+                   android:icon="@mipmap/ic_launcher_browser"
                    android:backupAgent=".BrowserBackupAgent"
                    android:hardwareAccelerated="false"
                    android:taskAffinity="android.task.browser" >
@@ -147,7 +147,7 @@
         <activity android:name="ShortcutActivity"
             android:theme="@style/ShortcutTheme"
             android:label="@string/shortcut_bookmark"
-            android:icon="@drawable/ic_launcher_shortcut_browser_bookmark">
+            android:icon="@mipmap/ic_launcher_shortcut_browser_bookmark">
 
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
diff --git a/res/drawable-hdpi/ic_launcher_browser.png b/res/drawable-hdpi/ic_launcher_browser.png
deleted file mode 100644
index 2ca92c8..0000000
Binary files a/res/drawable-hdpi/ic_launcher_browser.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png b/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png
deleted file mode 100644
index 7b2c680..0000000
Binary files a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_launcher_browser.png b/res/drawable-mdpi/ic_launcher_browser.png
deleted file mode 100755
index f9d6172..0000000
Binary files a/res/drawable-mdpi/ic_launcher_browser.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png b/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png
deleted file mode 100644
index aa05683..0000000
Binary files a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png and /dev/null differ
diff --git a/res/layout/bookmarklistwidget.xml b/res/layout/bookmarklistwidget.xml
index 983854c..17aee1d 100644
--- a/res/layout/bookmarklistwidget.xml
+++ b/res/layout/bookmarklistwidget.xml
@@ -33,7 +33,7 @@
             android:id="@+id/logo"
             android:layout_width="32dp"
             android:layout_height="32dp"
-            android:src="@drawable/ic_launcher_browser" />
+            android:src="@mipmap/ic_launcher_browser" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
new file mode 100644
index 0000000..2ca92c8
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_browser.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png
new file mode 100644
index 0000000..7b2c680
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png
new file mode 100755
index 0000000..f9d6172
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_browser.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png
new file mode 100644
index 0000000..aa05683
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png differ
diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index 0fdad15..751c0b3 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -105,12 +105,12 @@ class BookmarkUtils {
             // Want to create a shortcut icon on the homescreen, so the icon
             // background is the red bookmark.
             return BitmapFactory.decodeResource(context.getResources(),
-                    R.drawable.ic_launcher_shortcut_browser_bookmark);
+                    R.mipmap.ic_launcher_shortcut_browser_bookmark);
         } else if (type == BookmarkIconType.ICON_INSTALLABLE_WEB_APP) {
             // Use the web browser icon as the background for the icon for an installable
             // web app.
             return BitmapFactory.decodeResource(context.getResources(),
-                    R.drawable.ic_launcher_browser);
+                    R.mipmap.ic_launcher_browser);
         }
         return null;
     }
-- 
cgit v1.1