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

Revert "Update notification icon asset names (Email)" 

Need to revert - doesn't build on Mac OS

This reverts commit cc82965ac9.

Change-Id: I98c03ebe85df29ff146d0cee6ae112ab36e6d8b0
This commit is contained in:
Rohan Shah 2014-10-13 18:58:56 +00:00
parent cc82965ac9
commit 72f6a2432e
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/authenticator_alternate.xml
View File

@ -25,7 +25,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="@string/account_manager_type_exchange" android:accountType="@string/account_manager_type_exchange"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/exchange_name_alternate"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_eas.xml
View File

@ -23,7 +23,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="@string/account_manager_type_exchange" android:accountType="@string/account_manager_type_exchange"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_imap.xml
View File

@ -23,7 +23,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="@string/account_manager_type_imap" android:accountType="@string/account_manager_type_imap"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/imap_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_legacy_eas.xml
View File

@ -23,7 +23,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.exchange" android:accountType="com.android.exchange"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_legacy_email.xml
View File

@ -23,7 +23,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="@mipmap/ic_launcher_mail" 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:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_legacy_imap.xml
View File

@ -23,7 +23,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="@string/account_manager_type_legacy_imap" android:accountType="@string/account_manager_type_legacy_imap"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/imap_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

2
res/xml/authenticator_pop3.xml
View File

@ -23,7 +23,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="@string/account_manager_type_pop3" android:accountType="@string/account_manager_type_pop3"
android:icon="@mipmap/ic_launcher_mail" 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:label="@string/pop3_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

3
src/com/android/email/EmailNotificationController.java
View File

@ -26,6 +26,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
@ -143,7 +144,7 @@ public class EmailNotificationController implements NotificationController {
.setContentText(contentText) .setContentText(contentText)
.setContentIntent(pending) .setContentIntent(pending)
.setNumber(number == null ? 0 : number) .setNumber(number == null ? 0 : number)
.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp) .setSmallIcon(R.drawable.ic_notification_mail_24dp)
.setWhen(mClock.getTime()) .setWhen(mClock.getTime())
.setTicker(ticker) .setTicker(ticker)
.setOngoing(ongoing); .setOngoing(ongoing);