diff options
| author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
| commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
| tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/res/layout | |
| parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
| parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 21 |
1 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 b3b939624..8038e633a 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -416,6 +416,26 @@ </TableRow> <TableRow + android:id="@+id/push_row" + 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_push" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + + <TextView + android:id="@+id/server_info_push" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + </TableRow> + <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -434,6 +454,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded" /> + </TableRow> </TableLayout> |