aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-26 22:53:55 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-26 22:53:55 +0200
commit21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b (patch)
tree4edf3e780709efdce46ccfe5c7cc92e556d8af83 /src/main/res/menu
parentd9ff61ea2e2a54e7ac17f13b56016a75c04fc734 (diff)
add 'create conference' dialog
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/start_conversation.xml14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index a89d71ff..327709fa 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"