Update notification text according to design

- "UNSEEN new messages" is the title for multiple new messages
- the small number in the right shows the unread count

Change-Id: I48f761b727ea8abc9277d737a08789fa63d10871

res/values/strings.xml

@@ -192,6 +192,10 @@
     <string name="notification_to_account">to <xliff:g id="receiver_name"
             example="Main">%1$s</xliff:g></string>
 
+    <!-- Notification for multiple messages [CHAR LIMIT=60] -->
+    <string name="notification_multiple_new_messages_fmt">
+        <xliff:g example="2">%1$d</xliff:g> new messages</string>
+
     <!-- Name given to "all accounts" in the account picker for shortcuts and widget [CHAR LIMIT=20] -->
     <string name="account_name_display_all">All Accounts</string>
 

src/com/android/email/NotificationController.java

@@ -370,7 +370,7 @@ public class NotificationController {
      */
     @VisibleForTesting
     Notification createNewMessageNotification(long accountId, long mailboxId, long messageId,
-            int unseenMessageCount, boolean enableAudio) {
+            int unseenMessageCount, int unreadCount, boolean enableAudio) {
         final Account account = Account.restoreAccountWithId(mContext, accountId);
         if (account == null) {
             return null;
@@ -385,11 +385,16 @@ public class NotificationController {
         if (senderName == null) {
             senderName = ""; // Happens when a message has no from.
         }
-        final String subject = message.mSubject;
+        final boolean multipleUnseen = unseenMessageCount > 1;
-        final Bitmap senderPhoto = getSenderPhoto(message);
+        final Bitmap senderPhoto = multipleUnseen ? null : getSenderPhoto(message);
-        final SpannableString title = getNewMessageTitle(senderName, account.mDisplayName);
+        final SpannableString title = getNewMessageTitle(senderName, unseenMessageCount);
+        // TODO: add in display name on the second line for the text, once framework supports
+        // multiline texts.
+        final String text = multipleUnseen
+                ? account.mDisplayName
+                : message.mSubject;
         final Bitmap largeIcon = senderPhoto != null ? senderPhoto : mGenericSenderIcon;
-        final Integer number = unseenMessageCount > 1 ? unseenMessageCount : null;
+        final Integer number = unreadCount > 1 ? unreadCount : null;
         final Intent intent;
         if (unseenMessageCount >= 1) {
             intent = Welcome.createOpenMessageIntent(mContext, accountId, mailboxId, messageId);
@@ -397,36 +402,26 @@ public class NotificationController {
             intent = Welcome.createOpenAccountInboxIntent(mContext, accountId);
         }
 
-        Notification notification = createAccountNotification(account, null, title, subject,
+        Notification notification = createAccountNotification(account, null, title, text,
                 intent, largeIcon, number, enableAudio);
         return notification;
     }
 
     /**
-     * Creates a notification title for a new message. If there is only 1 email account, just
+     * Creates a notification title for a new message. If there is only a single message,
-     * show the sender name. Otherwise, show both the sender and the account name, but, grey
+     * show the sender name. Otherwise, show "X new messages".
-     * out the account name.
      */
     @VisibleForTesting
-    SpannableString getNewMessageTitle(String sender, String receiverDisplayName) {
+    SpannableString getNewMessageTitle(String sender, int unseenCount) {
-        final int numAccounts = EmailContent.count(mContext, Account.CONTENT_URI);
+        String title;
-        if (numAccounts == 1) {
+        if (unseenCount > 1) {
-            return new SpannableString(sender);
+            title = String.format(
+                    mContext.getString(R.string.notification_multiple_new_messages_fmt),
+                    unseenCount);
         } else {
-            // "to [account name]"
+            title = sender;
-            String toAcccount = mContext.getResources().getString(R.string.notification_to_account,
-                    receiverDisplayName);
-            // "[Sender] to [account name]"
-            SpannableString senderToAccount = new SpannableString(sender + " " + toAcccount);
-
-            // "[Sender] to [account name]"
-            //           ^^^^^^^^^^^^^^^^^ <- Make this part gray
-            TextAppearanceSpan secondarySpan = new TextAppearanceSpan(
-                    mContext, R.style.notification_secondary_text);
-            senderToAccount.setSpan(secondarySpan, sender.length() + 1, senderToAccount.length(),
-                    0);
-            return senderToAccount;
         }
+        return new SpannableString(title);
     }
 
     /** Returns the system's current ringer mode */
@@ -636,8 +631,15 @@ public class NotificationController {
                         || (newMessageId != 0 && newMessageId != oldMessageId)) {
                     // Either the count or last message has changed; update the notification
                     boolean playAudio = (oldMessageCount == 0); // play audio on first notification
+
+                    int unreadCount = Utility.getFirstRowInt(
+                            mContext, ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailboxId),
+                            new String[] { MailboxColumns.UNREAD_COUNT },
+                            null, null, null, 0, 0);
+
                     Notification n = sInstance.createNewMessageNotification(
-                            mAccountId, mMailboxId, newMessageId, newMessageCount, playAudio);
+                            mAccountId, mMailboxId, newMessageId,
+                            newMessageCount, unreadCount, playAudio);
                     if (n != null) {
                         // Make the notification visible
                         sInstance.mNotificationManager.notify(

tests/src/com/android/email/NotificationControllerTest.java

@@ -213,7 +213,7 @@ public class NotificationControllerTest extends AndroidTestCase {
         Mailbox b1 = ProviderTestUtils.setupMailbox("inbox", a1.mId, true, c, Mailbox.TYPE_INBOX);
         Message m1 = ProviderTestUtils.setupMessage("message", a1.mId, b1.mId, true, true, c);
 
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, true);
+        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, 1, true);
 
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
         assertEquals(mMockClock.mTime, n.when);
@@ -223,7 +223,7 @@ public class NotificationControllerTest extends AndroidTestCase {
         // TODO Check content -- how?
 
         // Case 2: 1 account, 2 unseen message
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 2, true);
+        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 2, 2, true);
 
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
         assertEquals(mMockClock.mTime, n.when);
@@ -247,27 +247,9 @@ public class NotificationControllerTest extends AndroidTestCase {
         m1.save(c);
 
         // This shouldn't crash.
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, true);
+        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, 1, true);
 
         // Minimum test for the result
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
     }
-
-    public void testGetNewMessageTitle() {
-        final Context c = mProviderContext;
-
-        // Case 1: 1 account
-        Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
-
-        // Just check the content.  Ignore the spans.
-        String title = mTarget.getNewMessageTitle("*sender*", "*receiver*").toString();
-        assertEquals("*sender*", title);
-
-        // Case 1: 2 account
-        Account a2 = ProviderTestUtils.setupAccount("a1", true, c);
-
-        // Just check the content.  Ignore the spans.
-        title = mTarget.getNewMessageTitle("*sender*", "*receiver*").toString();
-        assertEquals("*sender* to *receiver*", title);
-    }
 }