From f3d43641c985c8b2d0da4ae420f15b4dd7cf2891 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 29 Nov 2010 14:46:27 -0800
Subject: [PATCH] Make "mark unread" close current message

- XLFragmentManager.selectMailbox() used to hide the message view
  when it's visible, but not anymore.  Made goBackToMailbox() itself
  hide it instead.

- Also made onMarkAsUnread() not call the unread callback, which was
  already done in onMarkMessageAsRead().

Bug 3214538

Change-Id: I52fb8bb745cdaa517624a9aeec074122f10aac4a
---
 .../android/email/activity/MessageListXLFragmentManager.java    | 2 +-
 src/com/android/email/activity/MessageViewFragment.java         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/email/activity/MessageListXLFragmentManager.java b/src/com/android/email/activity/MessageListXLFragmentManager.java
index 72f4f27d0..d61a0b5f6 100644
--- a/src/com/android/email/activity/MessageListXLFragmentManager.java
+++ b/src/com/android/email/activity/MessageListXLFragmentManager.java
@@ -360,7 +360,7 @@ class MessageListXLFragmentManager {
      */
     public void goBackToMailbox() {
         if (isMessageSelected()) {
-            selectMailbox(getMailboxId(), false);
+            mThreePane.showLeftPane(); // Show mailbox list
         }
     }
 
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 0e4e5de9e..7584cefb6 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -408,7 +408,6 @@ public class MessageViewFragment extends MessageViewFragmentBase {
 
     private void onMarkAsUnread() {
         onMarkMessageAsRead(false);
-        mCallback.onMessageSetUnread();
     }
 
     /**