Merge "Move application icon to mipmap-* directories"

This commit is contained in:
Andy Stadler 2010-11-23 12:16:00 -08:00 committed by Android (Google) Code Review
commit 4091ffe94f
5 changed files with 5 additions and 3 deletions

View File

@ -56,7 +56,9 @@
android:description="@string/permission_access_provider_desc"/> android:description="@string/permission_access_provider_desc"/>
<uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/> <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>
<application android:icon="@drawable/icon" android:label="@string/app_name" <application
android:icon="@mipmap/icon"
android:label="@string/app_name"
android:name="Email" android:name="Email"
android:theme="@android:style/Theme.Holo.Light" android:theme="@android:style/Theme.Holo.Light"
android:hardwareAccelerated="false" android:hardwareAccelerated="false"

View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -22,7 +22,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="com.android.email" android:accountType="com.android.email"
android:icon="@drawable/icon" android:icon="@mipmap/icon"
android:smallIcon="@drawable/stat_notify_email_generic" android:smallIcon="@drawable/stat_notify_email_generic"
android:label="@string/app_name" android:label="@string/app_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"

View File

@ -164,7 +164,7 @@ public class AccountShortcutPicker extends ListActivity implements OnItemClickLi
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, account.getDisplayName()); intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, account.getDisplayName());
Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.drawable.icon); Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.icon);
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource); intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
// Now, return the result to the launcher // Now, return the result to the launcher