commit 1e320f8814457b165a1dc25d9b21d03546808c9d
author Tom Taylor <tomtaylor@google.com> Thu Jan 03 09:50:58 2013 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 03 09:50:58 2013 -0800
tree ec417e15b716ba174c60c5d8f8920669dbb8481b
parent 3d0efa0ca2df27a46ef49c3654873b030ebb5dd0
parent da3bbf39e92b43124dd71c7118f8a606ace7f6c9

Merge "Enhance performance by using ViewHolder"

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() {