aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/message_received.xml
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-31 17:14:53 +0100
committerChristian S <christian@pix-art.de>2015-10-31 17:14:53 +0100
commitc5dc1628a4068b8af3b2250080897e35937dc815 (patch)
tree727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/res/layout/message_received.xml
parent107acd1a5b03d25aa38d1ad73b957482ea781035 (diff)
parentb9de159e97090e132b74e934bc42fa6186105fd2 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout/message_received.xml')
-rw-r--r--src/main/res/layout/message_received.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 07cca2c1e..7d4a0993b 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -11,8 +11,8 @@
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
@@ -74,6 +74,17 @@
android:orientation="horizontal"
android:paddingBottom="2dp">
+ <TextView
+ android:id="@+id/message_encryption"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
+ android:layout_marginRight="4sp"
+ android:textColor="@color/white70"
+ android:textStyle="bold"
+ android:textSize="?attr/TextSizeInfo" />
+
<ImageView
android:id="@+id/security_indicator"
android:layout_width="?attr/TextSizeInfo"