From be9af442efeafcbfbb369cc904490703b590a69e Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 21 Jan 2015 15:31:40 +0100
Subject: always allow access to contact details. provide add button in contact
 details

---
 src/main/res/layout/activity_contact_details.xml |  7 +++++++
 src/main/res/menu/conversations.xml              | 12 ------------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 5ecca25e8..1254a3ab7 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -65,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"
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 6c22ed185..d68c1436e 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -56,18 +56,6 @@
         android:showAsAction="never"
         android:title="@string/enable_notifications"/>
 
-    <item
-        android:id="@+id/action_block"
-        android:orderInCategory="72"
-        android:showAsAction="never"
-        android:title="@string/action_block_contact"/>
-
-    <item
-        android:id="@+id/action_unblock"
-        android:orderInCategory="73"
-        android:showAsAction="never"
-        android:title="@string/action_unblock_contact"/>
-
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3