ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a5ba0daa: Merge "New Email launcher icon, deprecating old asset Bug: 3362749" into honeycomb

Browse Source 
* commit 'a5ba0daac392ecfab9db6ae5c96d1a2c1a267b32':
  New Email launcher icon, deprecating old asset Bug: 3362749
This commit is contained in:
Justin Ho 2011-01-30 17:29:32 -08:00 committed by Android Git Automerger
commit 92c41d587a
7 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -85,7 +85,7 @@
<!-- Note: Actually, android:hardwareAccelerated could be "true", but in order to switch it
on/off in the debug screen, we have to set it "false" here and enable it at runtime. -->
<application
android:icon="@mipmap/icon"
android:icon="@mipmap/ic_launcher_email"
android:label="@string/app_name"
android:name="Email"
android:theme="@android:style/Theme.Holo.Light"

BIN
res/mipmap-hdpi/ic_launcher_email.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
res/mipmap-hdpi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
res/mipmap-mdpi/ic_launcher_email.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
res/mipmap-mdpi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

2
res/xml/pop_imap_authenticator.xml
View File

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

2
src/com/android/email/activity/AccountShortcutPicker.java
View File

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