diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-05-28 19:41:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 19:41:13 +0000 |
| commit | 970b4b7eb212d62fbcc5cfdb0fd6e652684c6716 (patch) | |
| tree | f42815c5e2e53e8ac3ef38c543a132dfdfafffb9 | |
| parent | f3440d33a9da544b202c05d1d5e4849674bcf5bf (diff) | |
| parent | 4e6aa25286d9971e9574d5e3470ad99a15cf93ce (diff) | |
| download | android_packages_apps_Email-970b4b7eb212d62fbcc5cfdb0fd6e652684c6716.tar.gz android_packages_apps_Email-970b4b7eb212d62fbcc5cfdb0fd6e652684c6716.tar.bz2 android_packages_apps_Email-970b4b7eb212d62fbcc5cfdb0fd6e652684c6716.zip | |
am 4e6aa252: Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
* commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce':
Support hooks for new contact photo source.
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/email/NotificationController.java | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index de666cc0a..23a209066 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -702,6 +702,7 @@ android:exported="false"> <intent-filter> <action android:name="com.android.mail.action.RESEND_NOTIFICATIONS" /> + <action android:name="com.android.mail.action.SEND_SET_NEW_EMAIL_INDICATOR" /> </intent-filter> <intent-filter> <action android:name="com.android.mail.action.CLEAR_NEW_MAIL_NOTIFICATIONS" /> diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java index 668d543fa..215bede62 100644 --- a/src/com/android/email/NotificationController.java +++ b/src/com/android/email/NotificationController.java @@ -700,8 +700,8 @@ public class NotificationController { // TODO: we don't always want getAttention to be true, but we don't necessarily have a // good heuristic for when it should or shouldn't be. - NotificationUtils.setNewEmailIndicator(context, unreadCount, unseenCount, account, folder, - true /* getAttention */); + NotificationUtils.sendSetNewEmailIndicatorIntent(context, unreadCount, unseenCount, + account, folder, true /* getAttention */); } private static void refreshAllNotifications(final Context context) { @@ -720,7 +720,8 @@ public class NotificationController { } private static void refreshAllNotificationsInternal(final Context context) { - NotificationUtils.resendNotifications(context, false, null, null); + NotificationUtils.resendNotifications( + context, false, null, null, null /* ContactPhotoFetcher */); } /** |