1 files changed, 62 insertions, 39 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index ca641886e..15e806ae6 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -13,10 +13,10 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             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="@dimen/infocard_padding">
 
@@ -24,66 +24,66 @@
                 android:id="@+id/details_contact_badge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxHeight="384dp"
-                android:maxWidth="384dp"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
+                android:adjustViewBounds="true"
                 android:background="@drawable/message_border"
-                android:padding="1dp"
-                android:adjustViewBounds="true" />
+                android:maxHeight="384dp"
+                android:maxWidth="384dp"
+                android:padding="1dp" />
 
             <LinearLayout
                 android:id="@+id/details_jidbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_below="@+id/details_contact_badge"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginTop="16dp"
                 android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true">
+                android:layout_alignParentRight="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/details_contact_badge"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/details_contactjid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
                     android:text="@string/account_settings_example_jabber_id"
                     android:textColor="@color/black87"
+                    android:textIsSelectable="true"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"
-                    android:layout_gravity="center_horizontal"
-                    android:textIsSelectable="true"
                     android:visibility="gone" />
 
                 <com.wefika.flowlayout.FlowLayout
                     android:id="@+id/tags"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginLeft="-2dp"
+                    android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="4dp"
-                    android:orientation="horizontal"
-                    android:layout_gravity="center_horizontal"></com.wefika.flowlayout.FlowLayout>
+                    android:layout_marginLeft="-2dp"
+                    android:layout_marginTop="4dp"
+                    android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout>
 
                 <TextView
                     android:id="@+id/details_lastseen"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
                     android:textColor="@color/black54"
-                    android:textSize="?attr/TextSizeBody"
-                    android:layout_gravity="center_horizontal" />
+                    android:textSize="?attr/TextSizeBody" />
 
                 <github.ankushsachdeva.emojicon.EmojiconTextView
-                    android:layout_marginTop="8dp"
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center_horizontal"
                     android:textColor="@color/black54"
-                    android:textStyle="italic"
                     android:textSize="?attr/TextSizeBody"
-                    android:layout_gravity="center_horizontal"
-                    android:gravity="center_horizontal" />
+                    android:textStyle="italic" />
 
             </LinearLayout>
 
@@ -103,10 +103,10 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             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="@dimen/infocard_padding">
 
@@ -114,48 +114,71 @@
                 android:id="@+id/add_contact_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/add_contact"
-                android:layout_gravity="center_horizontal"
                 android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true" />
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/add_contact" />
 
             <CheckBox
                 android:id="@+id/details_send_presence"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/add_contact_button"
                 android:text="@string/send_presence_updates"
                 android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody"
-                android:layout_below="@+id/add_contact_button"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
+                android:textSize="?attr/TextSizeBody" />
 
             <CheckBox
                 android:id="@+id/details_receive_presence"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/details_send_presence"
                 android:text="@string/receive_presence_updates"
                 android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody"
-                android:layout_below="@+id/details_send_presence"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
+                android:textSize="?attr/TextSizeBody" />
 
         </RelativeLayout>
 
         <LinearLayout
-            android:id="@+id/details_contact_keys"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             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="@dimen/infocard_padding"
-            android:showDividers="middle"></LinearLayout>
+            android:padding="@dimen/infocard_padding">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/details_contact_keys"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:divider="?android:dividerHorizontal"
+                    android:orientation="vertical"
+                    android:showDividers="middle">
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/show_inactive_devices"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/show_inactive_devices"
+                    android:textColor="@color/accent" />
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
 
 </ScrollView>