commit 3d0efa0ca2df27a46ef49c3654873b030ebb5dd0
author Tom Taylor <tomtaylor@google.com> Wed Jan 02 13:41:22 2013 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 02 13:41:22 2013 -0800
tree 06e9e552bf82463c366f718d971e339c63b383c3
parent 04dc066613199c8b7eda7885beb2619959d537be
parent b2511fb26349890e8901f37cf8800bdf0af952c3

Merge "Mms: Add initialization the mLayoutType parameter."

src/com/android/mms/model/LayoutModel.java

diff --git a/src/com/android/mms/model/LayoutModel.java b/src/com/android/mms/model/LayoutModel.java
index 97b1637..0280534 100644
--- a/src/com/android/mms/model/LayoutModel.java
+++ b/src/com/android/mms/model/LayoutModel.java
@@ -110,6 +110,11 @@
         if (mTextRegion == null) {
             createDefaultTextRegion();
         }
+        // LayoutModel will re-construct when orientation changes, so we need to
+        // initialize mLayoutType here. Otherwise, the mLayoutType is alway default
+        // value (LAYOUT_BOTTOM_TEXT) after LayoutModel re-construct.
+        mLayoutType =
+                (mImageRegion.getTop() == 0) ? LAYOUT_BOTTOM_TEXT : LAYOUT_TOP_TEXT;
     }
 
     public RegionModel getRootLayout() {