commit 13c9f13ce4d2303c49c38966ea82d698ada74eea
author Mark Wei <markwei@google.com> Thu Sep 05 06:18:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 05 06:18:04 2013 +0000
tree 56d9d3265ede03e7cef53453c93813bd25d6ee86
parent abd69d12d4be7613a0636bc9fd4dccd30a2ee327
parent 4823c7cdb8069ac937f9a7d8d6c612d58f05e710

Merge "Only decode EXIF orientation for JPEG images." into jb-ub-mail-ur11

src/com/android/mail/providers/UIProvider.java

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 30d38c9..200d5dd 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -729,6 +729,8 @@
         public static final int INBOX_SECTION = 1 << 10;
         /** A system defined unread folder */
         public static final int UNREAD = 1 << 11;
+        /** A "fake" search folder */
+        public static final int SEARCH = 1 << 12;
     }
 
     public static final class FolderCapabilities {

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index f2c28d8..5fbcf95 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -94,6 +94,7 @@
 import com.android.mail.providers.UIProvider.ConversationColumns;
 import com.android.mail.providers.UIProvider.ConversationOperations;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
+import com.android.mail.providers.UIProvider.FolderType;
 import com.android.mail.ui.ActionableToastBar.ActionClickedListener;
 import com.android.mail.utils.ContentProviderTask;
 import com.android.mail.utils.DrawIdler;
@@ -855,7 +856,14 @@
             exitCabMode();
         }
 
-        changeFolder(folder, null, force);
+        final String query;
+        if (folder != null && folder.isType(FolderType.SEARCH)) {
+            query = mConvListContext.searchQuery;
+        } else {
+            query = null;
+        }
+
+        changeFolder(folder, query, force);
     }
 
     /**

src/com/android/mail/ui/RecentFolderList.java

diff --git a/src/com/android/mail/ui/RecentFolderList.java b/src/com/android/mail/ui/RecentFolderList.java
index 25f3568..d225f94 100644
--- a/src/com/android/mail/ui/RecentFolderList.java
+++ b/src/com/android/mail/ui/RecentFolderList.java
@@ -26,6 +26,7 @@
 import com.android.mail.providers.AccountObserver;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.Settings;
+import com.android.mail.providers.UIProvider.FolderType;
 import com.android.mail.utils.FolderUri;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.LruCache;
@@ -200,8 +201,8 @@
         }
         assert (folder != null);
 
-        if (folder.isProviderFolder()) {
-            LogUtils.d(TAG, "Not touching recent folder because it's provider folder");
+        if (folder.isProviderFolder() || folder.isType(FolderType.SEARCH)) {
+            LogUtils.d(TAG, "Not touching recent folder because it's provider or search folder");
             return;
         }