diff options
| author | Andy Huang <ath@google.com> | 2014-10-16 22:33:23 -0700 |
|---|---|---|
| committer | Andy Huang <ath@google.com> | 2014-10-16 22:33:23 -0700 |
| commit | 547cc85c36801be6601af1c30d239d30f30e15a3 (patch) | |
| tree | bac3c979f2871355b6739c395b18fbe1e3b6ea09 /src | |
| parent | 80c6dc4cb0b29f12f96f98eea7b4fe1883aa09df (diff) | |
| download | android_packages_apps_UnifiedEmail-547cc85c36801be6601af1c30d239d30f30e15a3.tar.gz android_packages_apps_UnifiedEmail-547cc85c36801be6601af1c30d239d30f30e15a3.tar.bz2 android_packages_apps_UnifiedEmail-547cc85c36801be6601af1c30d239d30f30e15a3.zip | |
restore peeking state
Bug: 18024070
Change-Id: I0f4379e92fa1a9c67b76264ae0baa581399f5ab3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/TwoPaneController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java index d5f019a2f..abcb9a594 100644 --- a/src/com/android/mail/ui/TwoPaneController.java +++ b/src/com/android/mail/ui/TwoPaneController.java @@ -296,10 +296,11 @@ public final class TwoPaneController extends AbstractActivityController implemen mSavedPeekingConversation = conversation; mViewMode.enterConversationListMode(); - - return; + } else if (mCurrentConversationJustPeeking && mIsTabletLandscape) { + showConversationWithPeek(conversation, true /* peek */); + } else { + super.restoreConversation(conversation); } - super.restoreConversation(conversation); } @Override |