Merge "Show unreadcount in top spinner."
diff --git a/src/com/android/mail/ConversationListContext.java b/src/com/android/mail/ConversationListContext.java
index 9ff843d..fa6bbb0 100644
--- a/src/com/android/mail/ConversationListContext.java
+++ b/src/com/android/mail/ConversationListContext.java
@@ -83,9 +83,9 @@
}
/**
- * Builds a context for a view to a Gmail folder. Note that folder may be null, in which case
- * the context defaults to a view of the user's default inbox.
- * Should only be called from an async task when the folder is null.
+ * Builds a context for a view to a Gmail folder. Note that folder may be
+ * null, in which case the context defaults to a view of the user's default
+ * inbox. Should only be called from an async task when the folder is null.
*/
public static ConversationListContext forFolder(Context context, Account account, Folder folder) {
if (folder == null) {
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index b130c3d..2aab5f4 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -233,6 +233,8 @@
/**
* This string column contains the content provider uri that can be queried for search
* results.
+ * The supported query parameters are limited to those listed
+ * in {@link #SearchQueryParameters}
*/
public static final String SEARCH_URI = "searchUri";
@@ -309,6 +311,20 @@
public static final String MIME_TYPE = "mimeType";
}
+ public static final class SearchQueryParameters {
+ /**
+ * Parameter used to specify the search query.
+ */
+ public static final String QUERY = "query";
+
+ /**
+ * If specified, the query results will be limited to this folder.
+ */
+ public static final String FOLDER = "folder";
+
+ private SearchQueryParameters() {}
+ }
+
// We define a "folder" as anything that contains a list of conversations.
public static final String FOLDER_LIST_TYPE =
"vnd.android.cursor.dir/vnd.com.android.mail.folder";
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 8e1aefb..0bf375b 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -290,7 +290,7 @@
@Override
public void onFolderChanged(Folder folder) {
- if (folder!= null && !folder.equals(mFolder)) {
+ if (folder != null && !folder.equals(mFolder)) {
setFolder(folder);
mConvListContext = ConversationListContext.forFolder(mContext, mAccount, mFolder);
showConversationList(mConvListContext);