Add folder types, icons.

Change-Id: I43b3126b1f6e6bb4cd58763a3a17a357d4d1f9b5
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 4687309..dec32f9 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -322,7 +322,9 @@
         FolderColumns.TOTAL_COUNT,
         FolderColumns.REFRESH_URI,
         FolderColumns.SYNC_STATUS,
-        FolderColumns.LAST_SYNC_RESULT
+        FolderColumns.LAST_SYNC_RESULT,
+        FolderColumns.TYPE,
+        FolderColumns.ICON_RES_ID
     };
 
     public static final int FOLDER_ID_COLUMN = 0;
@@ -338,6 +340,18 @@
     public static final int FOLDER_REFRESH_URI_COLUMN = 10;
     public static final int FOLDER_SYNC_STATUS_COLUMN = 11;
     public static final int FOLDER_LAST_SYNC_RESULT_COLUMN = 12;
+    public static final int FOLDER_TYPE_COLUMN = 13;
+    public static final int FOLDER_ICON_RES_ID_COLUMN = 14;
+
+    public static final class FolderType {
+        public static final int DEFAULT = 0;
+        public static final int INBOX = 1;
+        public static final int DRAFT = 2;
+        public static final int OUTBOX = 3;
+        public static final int SENT = 4;
+        public static final int TRASH = 5;
+        public static final int SPAM = 6;
+    }
 
     public static final class FolderCapabilities {
         public static final int SYNCABLE = 0x0001;
@@ -412,7 +426,14 @@
          * LastSyncStatus values defined above
          */
         public static final String LAST_SYNC_RESULT  = "lastSyncResult";
-
+        /**
+         * This long column contains the icon res id for this folder, or 0 if there is none.
+         */
+        public static final String ICON_RES_ID = "iconResId";
+        /**
+         * This int column contains the type of the folder. Zero is default.
+         */
+        public static final String TYPE = "type";
         public FolderColumns() {}
     }