aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-06-19 23:05:08 +0200
committerlookshe <github@lookshe.org>2015-06-19 23:05:08 +0200
commit92864c6696cf776de356f5e9bbe403a691c8746d (patch)
treedd6fa0fe95f88977b2c92f8bb75b3417f1edfdd2 /src/main/res/layout
parent5586c90e1a063066f07a7f06275bb67bd819b18c (diff)
parenta7121b51b8239a695dc685adaaf207d61170fee4 (diff)
Merge branch 'trz/rename' (early part) into trz/master
Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/contact.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 69545c25..f0ef5d94 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -11,8 +11,15 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
- android:src="@drawable/ic_profile" >
- </ImageView>
+ android:src="@drawable/ic_profile" />
+ <TextView
+ android:layout_width="48dp"
+ android:layout_height="4dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:id="@+id/contact_status"
+ android:layout_below="@+id/contact_photo"
+ android:paddingTop="8dp"
+ android:paddingRight="8dp"/>
<LinearLayout
android:layout_width="wrap_content"