diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/layout/message_status.xml | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/layout/message_status.xml')
| -rw-r--r-- | src/main/res/layout/message_status.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index d5f8bb33..20544cd5 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -19,4 +19,17 @@ android:scaleType="fitXY" android:src="@drawable/ic_profile" /> + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginLeft="8dp" + android:layout_toEndOf="@+id/message_photo" + android:layout_toRightOf="@+id/message_photo" + android:text="@string/contact_has_read_up_to_this_point" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" + android:textStyle="italic"/> + </RelativeLayout>
\ No newline at end of file |