diff options
author | Ying Wang <wangying@google.com> | 2010-11-23 11:17:46 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2010-11-23 13:19:04 -0800 |
commit | 79697cb903422de8b7290506471a1a128325b82b (patch) | |
tree | 6b9efe6b47d6f52c5337df2d52bc288b8d216a78 | |
parent | dc62cb9c7a75ab767e03baa5464a14d34a6312e2 (diff) | |
download | packages_apps_Browser-79697cb903422de8b7290506471a1a128325b82b.zip packages_apps_Browser-79697cb903422de8b7290506471a1a128325b82b.tar.gz packages_apps_Browser-79697cb903422de8b7290506471a1a128325b82b.tar.bz2 |
Move icons to mipmap.
Change-Id: If6356ccfe3ae6b791f82157488b9a78c1724cef6
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | res/layout/bookmarklistwidget.xml | 2 | ||||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_browser.png (renamed from res/drawable-hdpi/ic_launcher_browser.png) | bin | 7531 -> 7531 bytes | |||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png (renamed from res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png) | bin | 3328 -> 3328 bytes | |||
-rwxr-xr-x | res/mipmap-mdpi/ic_launcher_browser.png (renamed from res/drawable-mdpi/ic_launcher_browser.png) | bin | 4142 -> 4142 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png (renamed from res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png) | bin | 2160 -> 2160 bytes | |||
-rw-r--r-- | src/com/android/browser/BookmarkUtils.java | 4 |
7 files changed, 5 insertions, 5 deletions
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 Binary files differindex 2ca92c8..2ca92c8 100644 --- a/res/drawable-hdpi/ic_launcher_browser.png +++ b/res/mipmap-hdpi/ic_launcher_browser.png diff --git a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png Binary files differindex 7b2c680..7b2c680 100644 --- a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png +++ b/res/mipmap-hdpi/ic_launcher_shortcut_browser_bookmark.png diff --git a/res/drawable-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png Binary files differindex f9d6172..f9d6172 100755 --- a/res/drawable-mdpi/ic_launcher_browser.png +++ b/res/mipmap-mdpi/ic_launcher_browser.png diff --git a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png b/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png Binary files differindex aa05683..aa05683 100644 --- a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png +++ b/res/mipmap-mdpi/ic_launcher_shortcut_browser_bookmark.png 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; } |