diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 13:58:48 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 13:58:48 +0200 |
| commit | 75bafd573e47440911329dee1d3a12482dc1a76a (patch) | |
| tree | db0c359981faf007808e94a0d1265f6a23427813 /src/main/res | |
| parent | 81b7e27a468edb37994225fa7ad3581e26f73c9d (diff) | |
| parent | 4539643f27ce38e7de121655effcae4070e25385 (diff) | |
Merge pull request #1329 from hlad/server_info_http_upload
show HTTP upload availability on Edit account screen (server info)
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 20 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 2fdab08e..0be934a8 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -303,6 +303,26 @@ android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_http_upload" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_http_upload" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> </TableLayout> <RelativeLayout diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aa5bbec5..0e396491 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -191,6 +191,7 @@ <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> + <string name="server_info_http_upload">XEP-xxxx: HTTP File Upload</string> <string name="server_info_available">available</string> <string name="server_info_unavailable">unavailable</string> <string name="missing_public_keys">Missing public key announcements</string> |