aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/conversation_list_row.xml
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-01-13 17:48:30 +0100
committerChristian S <christian@pix-art.de>2016-01-13 17:48:30 +0100
commit4c2dc7082855581d875c51d97650c7b4a435abe5 (patch)
tree818ebaea4bfa9743e0acf85abc92afca7b51449a /src/main/res/layout/conversation_list_row.xml
parentc133b1d7e1cc9a3a3426d26e35cc038b508e1691 (diff)
parent3b3aa5b5841494ba02fe327f910558eb40e662b5 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout/conversation_list_row.xml')
-rw-r--r--src/main/res/layout/conversation_list_row.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 5d69f965a..124223c81 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
<View
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@color/primary"/>
<FrameLayout
android:id="@+id/swipeable_item"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:background="@color/grey50">
<RelativeLayout