diff options
| author | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
| commit | fe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch) | |
| tree | 562388d395f2547b85c49d8979dbab6193d08199 /src/main/res/layout | |
| parent | 2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff) | |
| parent | 3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/message_received.xml | 12 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 7d4a0993b..f8a8853ab 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -93,7 +93,17 @@ android:layout_marginRight="4sp" android:alpha="0.70" android:gravity="center_vertical" - android:src="@drawable/ic_secure_indicator_white" /> + android:src="@drawable/ic_lock_white_18dp" /> + + <ImageView + android:id="@+id/edit_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginRight="4sp" + android:alpha="0.70" + android:gravity="center_vertical" + android:src="@drawable/ic_mode_edit_white_18dp" /> <TextView android:id="@+id/message_time" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index c3aa62528..5ffb33114 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -93,7 +93,17 @@ android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" - android:src="@drawable/ic_secure_indicator" /> + android:src="@drawable/ic_lock_black_18dp" /> + + <ImageView + android:id="@+id/edit_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_mode_edit_black_18dp" /> <ImageView android:id="@+id/indicator_received" |