Merge branch 'development' of https://github.com/siacs/Conversations into development

1 files changed, 33 insertions, 0 deletions

diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
new file mode 100644
index 00000000..12109d7b
--- /dev/null
+++ b/res/menu/start_conversation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_search"
+        android:actionViewClass="android.widget.SearchView"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|always"
+        android:title="@string/search"/>
+    
+    <item
+        android:id="@+id/action_create_contact"
+        android:icon="@drawable/ic_action_add_person"
+        android:showAsAction="always"
+        android:title="@string/create_contact"/>
+    <item
+        android:id="@+id/action_create_conference"
+        android:icon="@drawable/ic_action_add_group"
+        android:showAsAction="always"
+        android:title="@string/create_conference"/>
+    
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file