diff options
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
8 files changed, 70 insertions, 36 deletions
diff --git a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml new file mode 100644 index 000000000..97bf65c0d --- /dev/null +++ b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/view_log" + android:title="@string/btn_view_log" + android:icon="@drawable/ic_view_list_grey_24dp" + /> + + <item + android:id="@+id/decrypt_save" + android:title="@string/btn_save_file" + android:icon="@drawable/ic_action_encrypt_file_24dp" + /> + + <item + android:id="@+id/decrypt_delete" + android:title="@string/btn_delete_original" + android:icon="@drawable/ic_delete_grey_24dp" + /> + +</menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml new file mode 100644 index 000000000..c71e426c5 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/encrypt_activity.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/check_use_symmetric" + android:title="@string/label_symmetric" + android:checkable="true" + android:orderInCategory="1" /> + +</menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml index d6ed726fa..e719487a7 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml @@ -6,39 +6,45 @@ android:id="@+id/encrypt_save" android:title="@string/btn_encrypt_save_file" android:icon="@drawable/ic_action_encrypt_save_24dp" - app:showAsAction="always" /> + android:orderInCategory="0" + app:showAsAction="ifRoom" /> <item android:id="@+id/encrypt_share" android:title="@string/btn_encrypt_share_file" android:icon="@drawable/ic_action_encrypt_share_24dp" - app:showAsAction="always" /> + android:orderInCategory="0" + app:showAsAction="ifRoom" /> <item - android:id="@+id/check_use_symmetric" - android:title="@string/label_symmetric" - android:checkable="true" /> + android:id="@+id/encrypt_copy" + android:title="@string/btn_copy_encrypted_signed" + android:icon="@drawable/ic_action_encrypt_copy_24dp" + android:orderInCategory="0" + app:showAsAction="ifRoom" /> <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" + android:orderInCategory="1" android:checkable="true" /> <item android:id="@+id/check_enable_compression" android:title="@string/label_enable_compression" - android:checked="true" + android:orderInCategory="1" android:checkable="true" /> <item android:id="@+id/check_encrypt_filenames" android:title="@string/label_encrypt_filenames" - android:checked="true" + android:orderInCategory="1" android:checkable="true" /> <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" + android:orderInCategory="1" android:checkable="true" /> <!--<item--> diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml index 5a262fdd8..80b78457d 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml @@ -6,22 +6,20 @@ android:id="@+id/encrypt_copy" android:title="@string/btn_copy_encrypted_signed" android:icon="@drawable/ic_action_encrypt_copy_24dp" - app:showAsAction="always" /> + android:orderInCategory="1" + app:showAsAction="ifRoom" /> <item android:id="@+id/encrypt_share" android:title="@string/btn_share_encrypted_signed" android:icon="@drawable/ic_action_encrypt_share_24dp" - app:showAsAction="always" /> - - <item - android:id="@+id/check_use_symmetric" - android:title="@string/label_symmetric" - android:checkable="true" /> + android:orderInCategory="1" + app:showAsAction="ifRoom" /> <item android:id="@+id/check_enable_compression" android:title="@string/label_enable_compression" + android:orderInCategory="1" android:checked="true" android:checkable="true" /> diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index c4797d5f7..d3a2bd0fd 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -10,11 +10,6 @@ app:showAsAction="collapseActionView|always" /> <item - android:id="@+id/menu_key_list_export" - android:title="@string/menu_export_all_keys" - app:showAsAction="never" /> - - <item android:id="@+id/menu_key_list_create" android:title="@string/menu_manage_keys" app:showAsAction="never" /> diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml index 7fdf4a5c1..26bc9f98f 100644 --- a/OpenKeychain/src/main/res/menu/key_list_multi.xml +++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> <item android:id="@+id/menu_key_list_multi_encrypt" @@ -8,21 +8,8 @@ android:title="@string/menu_encrypt_to" /> <item - android:id="@+id/menu_key_list_multi_export" - android:showAsAction="never" - tools:ignore="AppCompatResource" - android:title="@string/menu_export_key" /> - - <item android:id="@+id/menu_key_list_multi_delete" - android:showAsAction="never" - tools:ignore="AppCompatResource" + android:icon="@drawable/ic_delete_white_24dp" android:title="@string/menu_delete_key" /> - <item - android:id="@+id/menu_key_list_multi_select_all" - android:showAsAction="never" - tools:ignore="AppCompatResource" - android:title="@string/menu_select_all" /> - </menu> diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 3d1b02958..14ea099f4 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -38,8 +38,14 @@ android:title="@string/menu_certify_fingerprint" /> <item + android:id="@+id/menu_key_view_certify_fingerprint_word" + app:showAsAction="never" + android:visible="false" + android:title="@string/menu_certify_fingerprint_word" /> + + <item android:id="@+id/menu_key_view_add_linked_identity" app:showAsAction="never" android:title="@string/menu_linked_add_identity" /> -</menu>
\ No newline at end of file +</menu> diff --git a/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml b/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml new file mode 100644 index 000000000..c4002a682 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_add_keyserver" + android:title="@string/menu_search" + android:icon="@drawable/ic_add_white_24dp" + app:showAsAction="always" /> +</menu>
\ No newline at end of file |