commit a8381a29c8f7b3136692446e26dcf03c22a115b5
author Mindy Pereira <mindyp@google.com> Thu May 24 15:29:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 15:29:47 2012 -0700
tree 367f861faae40ff83552f9cf3811e39663dacccf
parent 04ba80fafd4c8c4473443a23cc4e0d2c28d2542b
parent 3cb28b5e1598f74dedbdb87b187d9bd7e132ff0f

Merge "Enable undo for accounts that support it." into jb-ub-mail

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 6b01f0d..3fd9bfe 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -163,6 +163,15 @@
     }
 
     @Override
+    public void onFolderChanged(Folder folder) {
+        super.onFolderChanged(folder);
+        final FolderListFragment folderList = getFolderListFragment();
+        if (folderList != null) {
+            folderList.selectFolder(folder);
+        }
+    }
+
+    @Override
     public void onFolderSelected(Folder folder, boolean childView) {
         if (!childView && folder.hasChildren) {
             // Replace this fragment with a new FolderListFragment