diff options
| author | Tony Mantler <nicoya@google.com> | 2014-08-19 21:38:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:03:42 +0000 |
| commit | 1e6f26af804d32e4780599481a6e11152756348f (patch) | |
| tree | 36801d39b427542c94ad7bd5bf6429e2843cab74 /src | |
| parent | 523d3073f6d81e1d1e8b3ad249cc82e7e3496e01 (diff) | |
| parent | ebae672af4a423c57557e317f3befa9d318193e9 (diff) | |
| download | android_packages_apps_Email-1e6f26af804d32e4780599481a6e11152756348f.tar.gz android_packages_apps_Email-1e6f26af804d32e4780599481a6e11152756348f.tar.bz2 android_packages_apps_Email-1e6f26af804d32e4780599481a6e11152756348f.zip | |
Merge "Drawer resource updates" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 174a9e49a..025f0eff0 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -2675,13 +2675,13 @@ public class EmailProvider extends ContentProvider + " ELSE " + UIProvider.FolderType.DEFAULT + " END"; private static final String FOLDER_ICON = "CASE " + MailboxColumns.TYPE - + " WHEN " + Mailbox.TYPE_INBOX + " THEN " + R.drawable.ic_drawer_inbox - + " WHEN " + Mailbox.TYPE_DRAFTS + " THEN " + R.drawable.ic_drawer_drafts - + " WHEN " + Mailbox.TYPE_OUTBOX + " THEN " + R.drawable.ic_drawer_outbox - + " WHEN " + Mailbox.TYPE_SENT + " THEN " + R.drawable.ic_drawer_sent - + " WHEN " + Mailbox.TYPE_TRASH + " THEN " + R.drawable.ic_drawer_trash - + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_drawer_starred - + " ELSE " + R.drawable.ic_drawer_folder + " END"; + + " WHEN " + Mailbox.TYPE_INBOX + " THEN " + R.drawable.ic_drawer_inbox_24dp + + " WHEN " + Mailbox.TYPE_DRAFTS + " THEN " + R.drawable.ic_drawer_drafts_24dp + + " WHEN " + Mailbox.TYPE_OUTBOX + " THEN " + R.drawable.ic_drawer_outbox_24dp + + " WHEN " + Mailbox.TYPE_SENT + " THEN " + R.drawable.ic_drawer_sent_24dp + + " WHEN " + Mailbox.TYPE_TRASH + " THEN " + R.drawable.ic_drawer_trash_24dp + + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_drawer_starred_24dp + + " ELSE " + R.drawable.ic_drawer_folder_24dp + " END"; /** * Local-only folders set totalCount < 0; such folders should substitute message count for @@ -3799,11 +3799,11 @@ public class EmailProvider extends ContentProvider } } else if (column.equals(UIProvider.FolderColumns.ICON_RES_ID)) { if (mailboxType == Mailbox.TYPE_INBOX) { - values[i] = R.drawable.ic_drawer_inbox; + values[i] = R.drawable.ic_drawer_inbox_24dp; } else if (mailboxType == Mailbox.TYPE_UNREAD) { - values[i] = R.drawable.ic_drawer_unread; + values[i] = R.drawable.ic_drawer_unread_24dp; } else if (mailboxType == Mailbox.TYPE_STARRED) { - values[i] = R.drawable.ic_drawer_starred; + values[i] = R.drawable.ic_drawer_starred_24dp; } } } |