create dedicated button to enable undecided accounts

3 files changed, 15 insertions, 8 deletions

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 5dfe75458..35a779cf4 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -147,7 +147,7 @@
                         android:layout_centerVertical="true"
                         android:layout_toRightOf="@+id/your_photo"
                         android:orientation="vertical"
-                        android:paddingLeft="8dp">
+                        android:paddingLeft="@dimen/avatar_item_distance">
 
                         <android.support.text.emoji.widget.EmojiTextView
                             android:id="@+id/muc_your_nick"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 159b1256a..c414271ab 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -21,7 +21,7 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/contact_photo"
         android:orientation="vertical"
-        android:paddingLeft="16dp">
+        android:paddingLeft="@dimen/avatar_item_distance" >
 
         <android.support.text.emoji.widget.EmojiTextView
             android:id="@+id/contact_display_name"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index e276fc047..77b26f70d 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -49,9 +49,10 @@
 
         <LinearLayout
             android:id="@+id/action_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/key_action_width"
+            android:layout_height="48dp"
             android:layout_alignParentRight="true"
+            android:gravity="center"
             android:layout_centerVertical="true"
             android:orientation="vertical">
 
@@ -59,18 +60,25 @@
                 android:id="@+id/button_remove"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_remove"
                 android:visibility="gone" />
 
+            <ImageButton
+                android:id="@+id/button_enable_device"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="?attr/icon_alpha"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="@dimen/image_button_padding"
+                android:src="?attr/icon_enable_undecided_device"
+                android:visibility="gone" />
+
             <ImageView
                 android:id="@+id/verified_fingerprint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:padding="@dimen/image_button_padding"
                 android:src="@drawable/ic_verified_fingerprint"
                 android:visibility="gone" />
 
@@ -81,7 +89,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_gravity="center_horizontal"
                 android:visibility="gone" />
         </LinearLayout>
     </RelativeLayout>