commit 535af3345aa5caab4e2b47dd3b1539a301dbab1d
author Alice Yang <alice@google.com> Wed Sep 04 07:27:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 04 07:27:34 2013 +0000
tree ef7d7ef97887de0d3e2cf9727ae11708c0156818
parent 7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21
parent 7dd0e1cec391fc2562795d6e6d9fc91ab36ca647

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

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 ad30da0..fe38134 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -842,6 +842,12 @@
                 ? 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 8588163..4de715e 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -159,12 +159,6 @@
     }
 
     @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) {