From 21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 26 May 2016 22:53:55 +0200
Subject: add 'create conference' dialog

---
 src/main/res/menu/start_conversation.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/main/res/menu/start_conversation.xml')

diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index a89d71ffd..327709fa1 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -13,10 +13,20 @@
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
-        android:id="@+id/action_join_conference"
+        android:id="@+id/action_conference"
         android:icon="?attr/icon_add_group"
         android:showAsAction="always"
-        android:title="@string/join_conference" />
+        android:title="@string/join_or_create_conference">
+        <menu>
+            <item
+                android:id="@+id/action_join_conference"
+                android:title="@string/join_conference"/>
+            <item
+                android:id="@+id/action_create_conference"
+                android:title="@string/create_conference"/>
+
+        </menu>
+    </item>
     <item
         android:id="@+id/action_scan_qr_code"
         android:showAsAction="never"
-- 
cgit v1.2.3