am 1b07ce57: am 6943480a: am b1fb3da9: am 9cfe96d9: am c10a95be: fix occasional blank CV panes on activity startup

* commit '1b07ce57ada1df2223b59dbe61c7b08de906d4a1':
  fix occasional blank CV panes on activity startup

2 files changed, 19 insertions, 2 deletions

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index f36a2b312..a301eeb52 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -129,6 +129,8 @@ public final class TwoPaneController extends AbstractActivityController implemen
             sb.append(" mToShow.dueToKeyboard=");
             sb.append(mToShow.dueToKeyboard);
         }
+        sb.append(" mLayout=");
+        sb.append(mLayout);
     }
 
     @Override
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index df563fd3a..91f5f8043 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -196,6 +196,21 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener,
     }
 
     @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder(super.toString());
+        sb.append("{mTranslatedMode=");
+        sb.append(mTranslatedMode);
+        sb.append(" mCurrDragMode=");
+        sb.append(mCurrentDragMode);
+        sb.append(" mShouldInterceptCurrentTouch=");
+        sb.append(mShouldInterceptCurrentTouch);
+        sb.append(" mTransitionCompleteJobs=");
+        sb.append(mTransitionCompleteJobs);
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
     protected void dispatchDraw(@NonNull Canvas canvas) {
         // Draw children/update the canvas first.
         super.dispatchDraw(canvas);
@@ -695,12 +710,12 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener,
 
         // If this is the first view mode change, we can't perform any translations yet because
         // the view doesn't have any measurements.
-        if (mTranslatedMode != ViewMode.UNKNOWN) {
+        final int width = getMeasuredWidth();
+        if (width != 0) {
             // On view mode changes, ensure that we animate the panes & notify visibility changes.
             if (mShouldShowPreviewPanel) {
                 onTransitionComplete();
             } else {
-                final int width = getMeasuredWidth();
                 translateDueToViewMode(width, true /* animate */);
             }
         }