diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
| commit | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch) | |
| tree | 9a2152390f39c4a9c79490a0938f57fe728140f2 /res/layout/activity_edit_account.xml | |
| parent | ae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff) | |
| parent | 331be08859d68fa6a034b39c674fd7bb929c4a5c (diff) | |
Merge branch 'development'
Diffstat (limited to 'res/layout/activity_edit_account.xml')
| -rw-r--r-- | res/layout/activity_edit_account.xml | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml index 04f63795..91bda7b1 100644 --- a/res/layout/activity_edit_account.xml +++ b/res/layout/activity_edit_account.xml @@ -180,13 +180,38 @@ android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" /> - <TextView - android:id="@+id/otr_fingerprint" + <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> + android:layout_height="match_parent" + android:layout_marginTop="8dp"> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@+id/action_copy_to_clipboard" + android:orientation="vertical" + android:layout_centerVertical="true"> + + <TextView + android:id="@+id/otr_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + </LinearLayout> + + <ImageButton + android:id="@+id/action_copy_to_clipboard" + android:layout_width="32dp" + android:layout_height="32dp" + android:background="?android:selectableItemBackground" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:padding="4dp" + android:scaleType="fitXY" + android:src="@drawable/ic_action_copy" + android:visibility="invisible" /> + </RelativeLayout> </LinearLayout> </LinearLayout> </ScrollView> @@ -226,4 +251,4 @@ android:textColor="@color/secondarytext" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> |