diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/menu')
6 files changed, 49 insertions, 28 deletions
diff --git a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml new file mode 100644 index 000000000..d08fc7f42 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml @@ -0,0 +1,14 @@ +<?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_account_settings_delete" + android:title="@string/api_settings_delete_account" + app:showAsAction="never" /> + <item + android:id="@+id/menu_account_settings_cancel" + android:title="@string/api_settings_cancel" + app:showAsAction="never" /> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml index 82ee57a73..a21db6708 100644 --- a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml +++ b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml @@ -6,9 +6,5 @@ android:id="@+id/menu_api_settings_revoke" android:title="@string/api_settings_revoke" app:showAsAction="never" /> - <item - android:id="@+id/menu_api_settings_cancel" - android:title="@string/api_settings_cancel" - app:showAsAction="never" /> </menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml index 16992affb..f9f7f8f0a 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml @@ -3,6 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/menu_key_edit_save" + android:icon="@drawable/ic_action_save" + app:showAsAction="always" + android:title="@string/btn_save"> + </item> + <item android:id="@+id/menu_key_edit_export_file" app:showAsAction="never" android:title="@string/menu_export_key" /> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml index 10223522c..b75f4e9a6 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml @@ -2,11 +2,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/menu_key_list_import" - app:showAsAction="ifRoom|withText" - android:icon="@drawable/ic_action_add_person" - android:title="@string/menu_import" /> <item android:id="@+id/menu_key_list_search" @@ -16,23 +11,33 @@ app:showAsAction="collapseActionView|ifRoom" /> <item - android:id="@+id/menu_key_list_create" - app:showAsAction="never" - android:title="@string/menu_create_key" /> + android:id="@+id/menu_key_list_add" + app:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_action_add_person" + android:title="@string/menu_add_keys"> + <menu> + <item + android:id="@+id/menu_key_list_import" + app:showAsAction="never" + android:title="@string/menu_import" /> - <item - android:id="@+id/menu_key_list_create_expert" - app:showAsAction="never" - android:title="@string/menu_create_key_expert" /> + <item + android:id="@+id/menu_key_list_create" + app:showAsAction="never" + android:title="@string/menu_create_key" /> - <item - android:id="@+id/menu_key_list_export" - app:showAsAction="never" - android:title="@string/menu_export_keys" /> + <item + android:id="@+id/menu_key_list_create_expert" + app:showAsAction="never" + android:title="@string/menu_create_key_expert" /> + </menu> + </item> <item - android:id="@+id/menu_key_list_secret_export" - app:showAsAction="never" - android:title="@string/menu_export_secret_keys" /> + android:id="@+id/menu_key_list_export" + app:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_action_import_export" + android:title="@string/menu_export_keys"> + </item> </menu> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml index db709052f..50f83026c 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml @@ -2,10 +2,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_key_list_multi_select_all" - android:icon="@drawable/ic_action_select_all" - android:title="@string/menu_select_all" /> - <item android:id="@+id/menu_key_list_multi_export" android:icon="@drawable/ic_action_import_export" android:title="@string/menu_export_key" /> @@ -17,5 +13,9 @@ android:id="@+id/menu_key_list_multi_delete" android:icon="@drawable/ic_action_discard" android:title="@string/menu_delete_key" /> + <item + android:id="@+id/menu_key_list_multi_select_all" + android:icon="@drawable/ic_action_select_all" + android:title="@string/menu_select_all" /> </menu> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml index cd84cc91a..105368cbb 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml @@ -52,7 +52,7 @@ android:id="@+id/menu_key_keyserver" android:icon="@drawable/ic_action_import_export" app:showAsAction="always" - android:title="@string/menu_share"> + android:title="@string/menu_key_server"> <menu> <item android:id="@+id/menu_key_view_update" |