am bb9554d1: am 80c6dc4c: only auto-close the drawer when selecting from the list

* commit 'bb9554d11c00c19d30203686833fd28861a57238':
  only auto-close the drawer when selecting from the list

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index cce227a28..d5f019a2f 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -581,11 +581,6 @@ public final class TwoPaneController extends AbstractActivityController implemen
         // ViewMode.CONVERSATION and yet the conversation list goes in and out of visibility.
         enableOrDisableCab();
 
-        // close the drawer, if open
-        if (isDrawerOpen()) {
-            toggleDrawerState();
-        }
-
         // When a mode change is required, wait for onConversationVisibilityChanged(), the signal
         // that the mode change animation has finished, before rendering the conversation.
         mToShow = new ToShow(conversation, fromKeyboard);
@@ -619,6 +614,10 @@ public final class TwoPaneController extends AbstractActivityController implemen
 
     @Override
     public void onConversationSelected(Conversation conversation, boolean inLoaderCallbacks) {
+        // close the drawer when the user opens CV from the list
+        if (isDrawerOpen()) {
+            toggleDrawerState();
+        }
         super.onConversationSelected(conversation, inLoaderCallbacks);
         if (!mCurrentConversationJustPeeking) {
             // Shift the focus to the conversation in landscape mode.