aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-21 15:31:40 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-21 15:31:40 +0100
commitbe9af442efeafcbfbb369cc904490703b590a69e (patch)
tree4ca977dc793152b66044c6ea6e8b63b887edbf81 /src/main/res
parent764ef3c8cdebe0bd189a7d7c1031bb25dafa5f15 (diff)
always allow access to contact details. provide add button in contact details
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_contact_details.xml7
-rw-r--r--src/main/res/menu/conversations.xml12
2 files changed, 7 insertions, 12 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 5ecca25e..1254a3ab 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 6c22ed18..d68c1436 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -57,18 +57,6 @@
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"
android:showAsAction="never"