diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-23 23:22:57 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-23 23:22:57 +0200 |
| commit | b5abdd1b6ddf73cc9da49e3213d0d44e4b29ff5c (patch) | |
| tree | b1d28cc2b00622d7feeff4569aa2a054d3a82b80 /src/main/res/layout/dialog_message_details.xml | |
| parent | 52fec558adb2b4d9bb3df314fd919570e7198e26 (diff) | |
| parent | b789ace386ef3cfe6e0c3834b2a425813f702f43 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
Diffstat (limited to 'src/main/res/layout/dialog_message_details.xml')
| -rw-r--r-- | src/main/res/layout/dialog_message_details.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/main/res/layout/dialog_message_details.xml b/src/main/res/layout/dialog_message_details.xml index 84159f44..7c5d92cb 100644 --- a/src/main/res/layout/dialog_message_details.xml +++ b/src/main/res/layout/dialog_message_details.xml @@ -128,6 +128,28 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_httpuploaded" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAlignment="textEnd" + android:gravity="end" + android:id="@+id/dlgMsgDetFileHttpUploaded" /> + </TableRow> + + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white" + android:layout_marginTop="0.3dp" + android:layout_marginLeft="0.3dp" + android:layout_marginRight="0.3dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="@string/dlg_msg_details_file_mime" /> <TextView |