am 4e6aa252: Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev

* commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce':
  Support hooks for new contact photo source.
This commit is contained in:
Andrew Sapperstein 2014-05-28 19:41:13 +00:00 committed by Android Git Automerger
commit 970b4b7eb2
2 changed files with 5 additions and 3 deletions

View File

@ -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" />

View File

@ -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 */);
}
/**