diff options
| author | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
| commit | 14b688e0fbe62a0fef0fadcc20763faa21801d7a (patch) | |
| tree | 37fc7b87aa21326b0ca7ba97fee84aaf0ea6d3c2 /src/main/res/layout | |
| parent | 9e96d80e31c5d0455c4b15984eef5709cf1071fc (diff) | |
| parent | 91ec4839acef3e395e83815f211dd9771af1287e (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/message_status.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 2f14cbf54..ad4999674 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -9,6 +9,15 @@ android:paddingRight="8dp" android:paddingTop="5dp"> + <Button + android:id="@+id/load_more_messages" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/load_more_messages" + android:textColor="@color/accent" android:layout_centerVertical="true" + android:layout_centerHorizontal="true"/> + <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" android:layout_width="32dp" |