diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-14 21:15:28 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-14 21:15:28 +0100 |
commit | 1bfaacc66fd3ba1640a5d09a9b27a47df89bc99d (patch) | |
tree | 34d3ff18c50a34ad8091d0351b1771cd0259715f /src/main/res/menu/conversations.xml | |
parent | 870fb48e1ecd23ffb642810afa3d459f7bdf0d0d (diff) |
do not use pop up menus for encryption and attachment selection
Diffstat (limited to 'src/main/res/menu/conversations.xml')
-rw-r--r-- | src/main/res/menu/conversations.xml | 48 |
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" |