commit 695f6ed978cfa16ea4813852e2d0c0d5b7b5715c
author Vikram Aggarwal <viki@google.com> Mon Apr 09 12:12:55 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 12:12:55 2012 -0700
tree d24533568d694fd3dafe08884557e4a5c8600c45
parent 069e8510b212a3edfa22c42a26088f978a9cce1e
parent 0ec2a71d1bb48f1fa57f1a4c8a6d81a49f44400f

Merge "Resume CAB mode when returning to folder list mode"

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 9da5e83..d4cfd8a 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -1353,7 +1353,6 @@
         enableCabMode();
     }
 
-
     @Override
     public void onSetChanged(ConversationSelectionSet set) {
         // Do nothing. We don't care about changes to the set.

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

diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index f9354d6..2ff51c8 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -199,6 +199,7 @@
     @Override
     public void showFolderList() {
         mViewMode.enterFolderListMode();
+        enableCabMode();
         mLastFolderListTransactionId = replaceFragment(
                 FolderListFragment.newInstance(null, mAccount.folderListUri),
                 FragmentTransaction.TRANSIT_FRAGMENT_OPEN);