am 94409eea: am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '94409eea473f081984050df88b0f32fcf1b23c8c':
Revert "Update notification icon asset names (Email)"
diff --git a/res/xml/authenticator_alternate.xml b/res/xml/authenticator_alternate.xml
index fd29bb6..4019c34 100644
--- a/res/xml/authenticator_alternate.xml
+++ b/res/xml/authenticator_alternate.xml
@@ -25,7 +25,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_manager_type_exchange"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_name_alternate"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_eas.xml b/res/xml/authenticator_eas.xml
index 8970d51..d1f3a95 100644
--- a/res/xml/authenticator_eas.xml
+++ b/res/xml/authenticator_eas.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_manager_type_exchange"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_imap.xml b/res/xml/authenticator_imap.xml
index 487b3a2..41ade50 100644
--- a/res/xml/authenticator_imap.xml
+++ b/res/xml/authenticator_imap.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_manager_type_imap"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/imap_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_legacy_eas.xml b/res/xml/authenticator_legacy_eas.xml
index c4bdd14..424cf90 100644
--- a/res/xml/authenticator_legacy_eas.xml
+++ b/res/xml/authenticator_legacy_eas.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="com.android.exchange"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_legacy_email.xml b/res/xml/authenticator_legacy_email.xml
index 0b0d1f2..5f1b212 100644
--- a/res/xml/authenticator_legacy_email.xml
+++ b/res/xml/authenticator_legacy_email.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="com.android.email"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_legacy_imap.xml b/res/xml/authenticator_legacy_imap.xml
index 838d0e4..3dc3625 100644
--- a/res/xml/authenticator_legacy_imap.xml
+++ b/res/xml/authenticator_legacy_imap.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_manager_type_legacy_imap"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/imap_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/res/xml/authenticator_pop3.xml b/res/xml/authenticator_pop3.xml
index 589e80a..f0cfc77 100644
--- a/res/xml/authenticator_pop3.xml
+++ b/res/xml/authenticator_pop3.xml
@@ -23,7 +23,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_manager_type_pop3"
android:icon="@mipmap/ic_launcher_mail"
- android:smallIcon="@drawable/ic_notification_mail_wht_24dp"
+ android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/pop3_name"
android:accountPreferences="@xml/account_preferences"
/>
diff --git a/src/com/android/email/EmailNotificationController.java b/src/com/android/email/EmailNotificationController.java
index 8931012..e57b418 100644
--- a/src/com/android/email/EmailNotificationController.java
+++ b/src/com/android/email/EmailNotificationController.java
@@ -26,6 +26,7 @@
import android.content.Intent;
import android.database.ContentObserver;
import android.database.Cursor;
+import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
@@ -143,7 +144,7 @@
.setContentText(contentText)
.setContentIntent(pending)
.setNumber(number == null ? 0 : number)
- .setSmallIcon(R.drawable.ic_notification_mail_wht_24dp)
+ .setSmallIcon(R.drawable.ic_notification_mail_24dp)
.setWhen(mClock.getTime())
.setTicker(ticker)
.setOngoing(ongoing);
