diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/layout/activity_contact_details.xml | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/layout/activity_contact_details.xml')
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 21635208..1254a3ab 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -12,9 +12,12 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="16dp" > + android:padding="@dimen/infocard_padding" > <QuickContactBadge android:id="@+id/details_contact_badge" @@ -62,6 +65,13 @@ android:textSize="?attr/TextSizeBody" /> </LinearLayout> + <Button + android:id="@+id/add_contact_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/add_contact"/> + <CheckBox android:id="@+id/details_send_presence" android:layout_width="wrap_content" @@ -96,11 +106,14 @@ android:id="@+id/details_contact_keys" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:padding="8dp" + android:padding="@dimen/infocard_padding" android:showDividers="middle" > </LinearLayout> </LinearLayout> |