summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRay Chen <raychen@google.com>2014-10-02 05:01:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-02 05:01:33 +0000
commitf95ba7c5e12684821f2b755a828d2a96189b0f68 (patch)
tree89118c1839dc0215447e35e81ad64a84c84ba16a /src
parent56393790fea491408dd257d9aaf76729c0adb3d5 (diff)
parent6febbf7b15269edb5ca3b564f4e1e370376d7d03 (diff)
downloadandroid_packages_apps_UnifiedEmail-f95ba7c5e12684821f2b755a828d2a96189b0f68.tar.gz
android_packages_apps_UnifiedEmail-f95ba7c5e12684821f2b755a828d2a96189b0f68.tar.bz2
android_packages_apps_UnifiedEmail-f95ba7c5e12684821f2b755a828d2a96189b0f68.zip
Merge "Do not show compose button in ad view" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/ui/OnePaneController.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 12e3308b8..ad9c09feb 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -210,6 +210,10 @@ public final class OnePaneController extends AbstractActivityController {
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)) {