commit 803ee20f32437775f067e7bbc22b1743f9013fdf
author James Lemieux <jplemieux@google.com> Sun Nov 02 19:04:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 19:04:13 2014 +0000
tree 77006944f3afc9930e4ef6441d33038edf32c0ce
parent 7f0ad8a471ee4a37d117379dfd14a0f77ad341a2
parent 456bec29f542b4462442bfbf594f0adf1e108489

am 456bec29: Merge "Set the height of the list item, not the TextView within" into ub-gmail-ur14-dev

* commit '456bec29f542b4462442bfbf594f0adf1e108489':
  Set the height of the list item, not the TextView within

res/layout/conversation_list_footer_view.xml

diff --git a/res/layout/conversation_list_footer_view.xml b/res/layout/conversation_list_footer_view.xml
index e5d0fbd..ed83563 100644
--- a/res/layout/conversation_list_footer_view.xml
+++ b/res/layout/conversation_list_footer_view.xml
@@ -40,7 +40,7 @@
     <LinearLayout
         android:id="@+id/load_more"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?android:attr/listPreferredItemHeight"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:visibility="gone">
@@ -48,8 +48,8 @@
         <TextView
             style="@style/ConversationListFooterLoadMoreStyle"
             android:layout_width="wrap_content"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:text="@string/load_more"
             android:textAllCaps="true"
             android:textColor="@color/conversation_view_footer_load_more_text_color"