diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-08 17:29:15 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-08 17:29:15 +0100 |
| commit | 06398afd4002cf506e74cb471a2f7dd89f3810f7 (patch) | |
| tree | 6e811a1f1b136081d6bc4816bb225191480faac6 /src/main/res | |
| parent | 40afa7c9ee13a7ffee6417fba9e7dda39c087165 (diff) | |
| parent | 9b20223655c28cbe3fcd10617514648383d8ad31 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 9c951afd..0c9809bc 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -37,7 +37,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_toRightOf="@+id/avater"> + android:layout_toRightOf="@+id/avater" + android:id="@+id/editAccountBoxes"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -103,6 +104,22 @@ android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody" /> </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_toRightOf="@+id/avater" + android:id="@+id/displayAccountFrame" + android:visibility="gone"> + <TextView + android:id="@+id/detailsAccountJid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> + </LinearLayout> </RelativeLayout> <LinearLayout |