aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu/conversations.xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/res/menu/conversations.xml48
1 files changed, 46 insertions, 2 deletions
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index b748a065e..9687e45ff 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -12,13 +12,57 @@
android:icon="?attr/icon_not_secure"
android:orderInCategory="20"
app:showAsAction="always"
- android:title="@string/action_secure" />
+ android:title="@string/action_secure" >
+ <menu>
+ <group android:checkableBehavior="single">
+ <item
+ android:id="@+id/encryption_choice_none"
+ android:title="@string/encryption_choice_unencrypted" />
+ <item
+ android:id="@+id/encryption_choice_axolotl"
+ android:title="@string/encryption_choice_omemo" />
+ <item
+ android:id="@+id/encryption_choice_otr"
+ android:title="@string/encryption_choice_otr" />
+ <item
+ android:id="@+id/encryption_choice_pgp"
+ android:title="@string/encryption_choice_pgp" />
+ </group>
+ </menu>
+ </item>
<item
android:id="@+id/action_attach_file"
android:icon="?attr/icon_new_attachment"
android:orderInCategory="30"
app:showAsAction="always"
- android:title="@string/attach_file" />
+ android:title="@string/attach_file" >
+ <menu>
+
+ <item
+ android:id="@+id/attach_choose_file"
+ android:icon="?attr/ic_attach_document"
+ android:title="@string/choose_file" />
+
+ <item
+ android:id="@+id/attach_choose_picture"
+ android:icon="?attr/ic_attach_photo"
+ android:title="@string/attach_choose_picture" />
+
+ <item
+ android:id="@+id/attach_take_picture"
+ android:icon="?attr/ic_attach_camera"
+ android:title="@string/attach_take_from_camera" />
+ <item
+ android:id="@+id/attach_record_voice"
+ android:icon="?attr/ic_attach_record"
+ android:title="@string/attach_record_voice" />
+
+ <item
+ android:id="@+id/attach_location"
+ android:icon="?attr/ic_attach_location"
+ android:title="@string/send_location" />
+ </menu>
+ </item>
<item
android:id="@+id/action_invite"
android:orderInCategory="45"