diff options
| author | Vincent <valodim@mugenguild.com> | 2015-09-18 14:11:49 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2015-09-18 14:11:49 +0200 |
| commit | 2ebcc942d4a4faca97971b387d14c5ea1fcac16f (patch) | |
| tree | d5f74e29d7622df408bff138d644a2447f102603 /OpenKeychain/src/main/res/menu | |
| parent | f4f59abcfd234a6d9c361c101384bf370a7488f9 (diff) | |
| parent | 8ad31e32519b42c3ae439baa52716792980c5638 (diff) | |
| download | open-keychain-2ebcc942d4a4faca97971b387d14c5ea1fcac16f.tar.gz open-keychain-2ebcc942d4a4faca97971b387d14c5ea1fcac16f.tar.bz2 open-keychain-2ebcc942d4a4faca97971b387d14c5ea1fcac16f.zip | |
Merge pull request #1487 from open-keychain/mime4j
support multipart mime structure in decrypted data
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml | 19 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml | 12 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/log_display.xml | 2 |
3 files changed, 20 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml b/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml new file mode 100644 index 000000000..11b79bd5f --- /dev/null +++ b/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/decrypt_open" + android:title="Open with…" + android:icon="@drawable/ic_apps_black_24dp" /> + + <item + android:id="@+id/decrypt_share" + android:title="@string/btn_share_decrypted_text" + android:icon="@drawable/ic_share_black_24dp" /> + + <item + android:id="@+id/decrypt_save" + android:title="@string/btn_save" + android:icon="@drawable/ic_save_black_24dp" /> + +</menu> diff --git a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml index ab526c4a5..65b8f210d 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml @@ -8,18 +8,6 @@ /> <item - android:id="@+id/decrypt_share" - android:title="@string/btn_share_decrypted_text" - android:icon="@drawable/ic_share_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" diff --git a/OpenKeychain/src/main/res/menu/log_display.xml b/OpenKeychain/src/main/res/menu/log_display.xml index a7f7e286d..a32153359 100644 --- a/OpenKeychain/src/main/res/menu/log_display.xml +++ b/OpenKeychain/src/main/res/menu/log_display.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_log_display_export_log" - android:icon="@drawable/ic_share_black_24dp" + android:icon="@drawable/ic_share_white_24dp" android:title="@string/menu_share_log" app:showAsAction="ifRoom|withText" /> |