From e743a06ddf7677706da7450100e19d0f4509a43c Mon Sep 17 00:00:00 2001 From: Scott Kennedy Date: Wed, 4 Sep 2013 13:49:54 -0700 Subject: [PATCH] Allow going back to search results If you went from search results to conversation view, then hit the back button, we were taking you out of search results to the inbox, because we didn't know you had search results. Now, we're tracking this (through the use of a folder type), so we take you where you should go. Bug: 10591438 Change-Id: I12ad81323fe3e1f199d9dd06a1a4e18f765b01ee --- src/com/android/email/provider/EmailProvider.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 0d56812e4..bcb5fb4d9 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -462,7 +462,7 @@ public class EmailProvider extends ContentProvider { // If we have accounts, we're done if (DatabaseUtils.longForQuery(mainDatabase, - "SELECT EXISTS (SELECT ? FROM " + Account.TABLE_NAME + " )", + "SELECT EXISTS (SELECT ? FROM " + Account.TABLE_NAME + " )", EmailContent.ID_PROJECTION) > 0) { if (MailActivityEmail.DEBUG) { LogUtils.w(TAG, "restoreIfNeeded: Account exists."); @@ -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; }