commit 384fa2962733c4dce0cf7d3cf7c7dc0bb0c01af4
author Ray Chen <raychen@google.com> Sun Nov 02 20:49:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 20:49:20 2014 +0000
tree 4e436a68e0c827c67f5ba602b2ba2ea1eb4d1c3d
parent 527abdfcb06114638f197d9f5e92ba706d7ba891
parent b5eafddc78b082ec0bc354e7a48d6f8b10a543b4

am b5eafddc: am 5e190e52: am 9beb0b95: am e31381be: am f95ba7c5: Merge "Do not show compose button in ad view" into ub-gmail-ur14-dev

* commit 'b5eafddc78b082ec0bc354e7a48d6f8b10a543b4':
  Do not show compose button in ad view

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 12e3308..ad9c09f 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -210,6 +210,10 @@
             mPagerController.hide(true /* changeVisibility */);
         }
 
+        if (ViewMode.isAdMode(newMode)) {
+            onConversationListVisibilityChanged(false);
+        }
+
         // When we step away from the conversation mode, we don't have a current conversation
         // anymore. Let's blank it out so clients calling getCurrentConversation are not misled.
         if (!ViewMode.isConversationMode(newMode)) {