commit 7dd0e1cec391fc2562795d6e6d9fc91ab36ca647
author Alice Yang <alice@google.com> Wed Sep 04 06:43:16 2013 +0000
committer Alice Yang <alice@google.com> Wed Sep 04 06:43:16 2013 +0000
tree 203812635756eb004906fd2f8b426fddb48c6e73
parent c06821c54ed61b1efd4a7d878d03956023deef5c

Revert "Revert "Exit cab mode when we change folders""

This reverts commit c06821c54ed61b1efd4a7d878d03956023deef5c.

Change-Id: Ib8c2858498553690f5a6de2c41065bf4766a1c44

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 9a22a60..3a5556d 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 976dfa2..e3a88c6 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) {