commit 5a44d87a14e8d9778da7248627cc9948524a044e
author Alice Yang <alice@google.com> Tue Sep 03 14:58:59 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 14:58:59 2013 -0700
tree 6754d8257217c0712e0e0adacead167446bb616e
parent 3a644641997c39d906783629320bc487872f671e
parent 784f9e928f0b1e38f6cc94d7f201258ef573f40b

am 784f9e92: Merge "Revert "Exit cab mode when we change folders"" into jb-ub-mail-ur10

* commit '784f9e928f0b1e38f6cc94d7f201258ef573f40b':
  Revert "Exit cab mode when we change folders"

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 cf11bfd..ad59023 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -842,12 +842,6 @@
                 ? DrawerLayout.LOCK_MODE_UNLOCKED : DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
 
         mDrawerContainer.closeDrawers();
-
-        if (mFolder == null || !mFolder.equals(folder)) {
-            // We are actually changing the folder, so exit cab mode
-            exitCabMode();
-        }
-
         changeFolder(folder, null, force);
     }
 

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

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 4de715e..8588163 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -159,6 +159,12 @@
     }
 
     @Override
+    public void onFolderChanged(Folder folder, final boolean force) {
+        super.onFolderChanged(folder, force);
+        exitCabMode();
+    }
+
+    @Override
     public void onFolderSelected(Folder folder) {
         // It's possible that we are not in conversation list mode
         if (mViewMode.getMode() != ViewMode.CONVERSATION_LIST) {