diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:44:02 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:44:02 +0200 |
| commit | 25547747b37770b6ca8227c784488dd4deb5436f (patch) | |
| tree | 04274e9063bd17c8d09b1d4663f035d0d8a2ae8f /src/main/res/menu | |
| parent | 5edcb7714985e24e0a068eb0970135170f9a17ed (diff) | |
| parent | 25f6651848b67d225967cf1bb35e037c998a5682 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/start_conversation.xml | 14 |
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 b0472af05..305ffd223 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" |