diff options
author | Andy Huang <ath@google.com> | 2014-11-02 20:51:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:51:32 +0000 |
commit | ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3 (patch) | |
tree | 99c0c1c57c02536252ed12f8e8b55b73dcb1559b /src | |
parent | 474d01bf5417461dd626eeca368af5451e81bc94 (diff) | |
parent | e1c9a53d83bab16a3081f83b78ed784ff6fe07a8 (diff) | |
download | android_packages_apps_UnifiedEmail-ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3.tar.gz android_packages_apps_UnifiedEmail-ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3.tar.bz2 android_packages_apps_UnifiedEmail-ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3.zip |
am e1c9a53d: am 53de74fe: am 62c312d3: am bb9554d1: am 80c6dc4c: only auto-close the drawer when selecting from the list
* commit 'e1c9a53d83bab16a3081f83b78ed784ff6fe07a8':
only auto-close the drawer when selecting from the list
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/mail/ui/TwoPaneController.java | 9 |
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. |