Merge "Added query parameters for search"
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";