Merge "Allow going back to search results" into jb-ub-mail-ur10

This commit is contained in:
Scott Kennedy 2013-09-05 03:58:09 +00:00 committed by Android (Google) Code Review
commit ca064b2f84
1 changed files with 6 additions and 1 deletions

View File

@ -1998,6 +1998,8 @@ public class EmailProvider extends ContentProvider {
+ " WHEN " + Mailbox.TYPE_JUNK + " THEN " + UIProvider.FolderType.SPAM
+ " WHEN " + Mailbox.TYPE_STARRED + " THEN " + UIProvider.FolderType.STARRED
+ " WHEN " + Mailbox.TYPE_UNREAD + " THEN " + UIProvider.FolderType.UNREAD
+ " WHEN " + Mailbox.TYPE_SEARCH + " THEN "
+ getFolderTypeFromMailboxType(Mailbox.TYPE_SEARCH)
+ " ELSE " + UIProvider.FolderType.DEFAULT + " END";
private static final String FOLDER_ICON = "CASE " + MailboxColumns.TYPE
@ -3550,6 +3552,9 @@ public class EmailProvider extends ContentProvider {
return UIProvider.FolderType.STARRED;
case Mailbox.TYPE_UNREAD:
return UIProvider.FolderType.UNREAD;
case Mailbox.TYPE_SEARCH:
// TODO Can the DEFAULT type be removed from SEARCH folders?
return UIProvider.FolderType.DEFAULT | UIProvider.FolderType.SEARCH;
default:
return UIProvider.FolderType.DEFAULT;
}