diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2013-05-16 18:55:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-16 18:55:50 +0000 |
| commit | 5f1dbb7e66da7c4abca2cc52b84744b4bc8055ff (patch) | |
| tree | 76664100dd3dddc461653bd350f4672313d57c79 /src | |
| parent | 67b38031abbbf35b10854d3c8d3b4adf7cb08aaa (diff) | |
| parent | 7e753119260e53628f279176b0a41f5ef5713ce8 (diff) | |
| download | android_packages_apps_Email-5f1dbb7e66da7c4abca2cc52b84744b4bc8055ff.tar.gz android_packages_apps_Email-5f1dbb7e66da7c4abca2cc52b84744b4bc8055ff.tar.bz2 android_packages_apps_Email-5f1dbb7e66da7c4abca2cc52b84744b4bc8055ff.zip | |
Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index ead947346..0056b209f 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -3008,8 +3008,7 @@ public class EmailProvider extends ContentProvider { " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null); row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count; - // TODO: Hijacking the mark unread icon for now. - row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light; + row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread; mc.addRow(row); return mc; } else { @@ -3033,8 +3032,7 @@ public class EmailProvider extends ContentProvider { " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null); row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numUnread; - // TODO: Hijacking the mark unread icon for now. - row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light; + row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread; mc.addRow(row); Cursor[] cursors = new Cursor[] {mc, c}; return new MergeCursor(cursors); |