commit de5c4d2e29314f6578fa959b64c904bf0f81a8af
author Andy Huang <ath@google.com> Tue Apr 23 17:53:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 23 17:53:25 2013 -0700
tree 333aa2798415178ec0b65899a0903c045f8ac412
parent fbda411695c5e6d6f042cae021cadb61527374e3
parent dc5130aab2a30a72474cf54d40b0861dd8da0661

am dc5130aa: Merge "fix list view wide layout when photos disabled" into jb-mr2-dev

* commit 'dc5130aab2a30a72474cf54d40b0861dd8da0661':
  fix list view wide layout when photos disabled

res/layout/conversation_item_view_wide.xml

diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index 8f8891d..e175bc0 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -34,10 +34,14 @@
         android:layout_marginLeft="20dp"
         android:layout_marginRight="32dp">
 
+        <!-- minHeight here is to ensure more consistent item heights across gadget choices -->
+        <!-- and between 'normal' vs. 'wide' layouts (which is important during 2-pane -->
+        <!-- transitions)  -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:minHeight="66dp"
             android:gravity="center_vertical">
 
             <ImageView