Move icons to mipmap.
Change-Id: If6356ccfe3ae6b791f82157488b9a78c1724cef6
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/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/drawable-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_browser.png
rename to res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png
rename to res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_browser.png
rename to res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png
rename to res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png
Binary files 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 @@
// 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;
}
