am 535af334: Merge "Revert "Revert "Exit cab mode when we change folders""" into jb-ub-mail-ur10
* commit '535af3345aa5caab4e2b47dd3b1539a301dbab1d':
Revert "Revert "Exit cab mode when we change folders""
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);
}
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) {