diff options
| author | Andy Huang <ath@google.com> | 2014-11-02 20:51:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:51:34 +0000 |
| commit | a12e4583c584a9cc24019109286ebd1563b716a5 (patch) | |
| tree | cb622af24ff6beccf535194331ee86d00602e939 /src | |
| parent | ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3 (diff) | |
| parent | 18b62bdbfe827287ba259011f6b4242126e7fad9 (diff) | |
| download | android_packages_apps_UnifiedEmail-a12e4583c584a9cc24019109286ebd1563b716a5.tar.gz android_packages_apps_UnifiedEmail-a12e4583c584a9cc24019109286ebd1563b716a5.tar.bz2 android_packages_apps_UnifiedEmail-a12e4583c584a9cc24019109286ebd1563b716a5.zip | |
am 18b62bdb: am 07209a3d: am df5192d7: am f9c41264: am 547cc85c: restore peeking state
* commit '18b62bdbfe827287ba259011f6b4242126e7fad9':
restore peeking state
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 |