diff options
| author | Jin Cao <jinyan@google.com> | 2014-10-15 00:17:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 00:17:33 +0000 |
| commit | 8f42aa9199789985908cd530235da33970f0d69b (patch) | |
| tree | 6ce6763f9272aebc44d756dd37d1ec59384adf3e /src/com/android/mail | |
| parent | 127c9358332d7c3a9a2ead697c16b48641bf84f3 (diff) | |
| parent | 86a7cca10fca40e01420dca48ea37f8318123e96 (diff) | |
| download | android_packages_apps_UnifiedEmail-8f42aa9199789985908cd530235da33970f0d69b.tar.gz android_packages_apps_UnifiedEmail-8f42aa9199789985908cd530235da33970f0d69b.tar.bz2 android_packages_apps_UnifiedEmail-8f42aa9199789985908cd530235da33970f0d69b.zip | |
Merge "TPL don't set transitionedMode until onTransitionComplete" into ub-gmail-ur14-dev
Diffstat (limited to 'src/com/android/mail')
| -rw-r--r-- | src/com/android/mail/ui/TwoPaneLayout.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java index 22d5a70fa..91300eacd 100644 --- a/src/com/android/mail/ui/TwoPaneLayout.java +++ b/src/com/android/mail/ui/TwoPaneLayout.java @@ -271,7 +271,6 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener, } else { onTransitionComplete(); } - mTranslatedMode = mCurrentMode; } // Layout the children views @@ -433,6 +432,9 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener, } mTransitionCompleteJobs.clear(); + // We finished transitioning into the new mode. + mTranslatedMode = mCurrentMode; + // Notify conversation list layout listeners of position change. final int xEnd = mIsRtl ? mListLeft : mListRight; if (mShouldShowPreviewPanel && xEnd != 0) { @@ -689,7 +691,6 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener, final int width = getMeasuredWidth(); translateDueToViewMode(width, true /* animate */); } - mTranslatedMode = mCurrentMode; } } |