From 430ba2f7778e70c6c8a8c46e51de46543e074f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 25 Feb 2015 11:29:46 +0100 Subject: Bigger status icon in key view --- Graphics/update-drawables.sh | 19 +++++-- .../keychain/ui/ViewKeyActivity.java | 10 ++-- .../keychain/ui/adapter/SubkeysAdapter.java | 4 +- .../keychain/ui/util/KeyFormattingUtils.java | 57 +++++++++++++++------ .../res/drawable-hdpi/key_flag_authenticate.png | Bin 1302 -> 0 bytes .../drawable-hdpi/key_flag_authenticate_24px.png | Bin 0 -> 1302 bytes .../main/res/drawable-hdpi/key_flag_certify.png | Bin 2289 -> 0 bytes .../res/drawable-hdpi/key_flag_certify_24px.png | Bin 0 -> 2289 bytes .../main/res/drawable-hdpi/key_flag_encrypt.png | Bin 1530 -> 0 bytes .../res/drawable-hdpi/key_flag_encrypt_24px.png | Bin 0 -> 1530 bytes .../src/main/res/drawable-hdpi/key_flag_sign.png | Bin 1751 -> 0 bytes .../main/res/drawable-hdpi/key_flag_sign_24px.png | Bin 0 -> 1751 bytes .../main/res/drawable-hdpi/status_lock_closed.png | Bin 675 -> 0 bytes .../res/drawable-hdpi/status_lock_closed_24px.png | Bin 0 -> 675 bytes .../main/res/drawable-hdpi/status_lock_error.png | Bin 748 -> 0 bytes .../res/drawable-hdpi/status_lock_error_24px.png | Bin 0 -> 748 bytes .../main/res/drawable-hdpi/status_lock_open.png | Bin 675 -> 0 bytes .../res/drawable-hdpi/status_lock_open_24px.png | Bin 0 -> 675 bytes .../res/drawable-hdpi/status_signature_expired.png | Bin 723 -> 0 bytes .../status_signature_expired_cutout.png | Bin 789 -> 0 bytes .../status_signature_expired_cutout_24px.png | Bin 0 -> 789 bytes .../status_signature_expired_cutout_96px.png | Bin 0 -> 3241 bytes .../res/drawable-hdpi/status_signature_invalid.png | Bin 528 -> 0 bytes .../status_signature_invalid_cutout.png | Bin 444 -> 0 bytes .../status_signature_invalid_cutout_24px.png | Bin 0 -> 444 bytes .../status_signature_invalid_cutout_96px.png | Bin 0 -> 1656 bytes .../res/drawable-hdpi/status_signature_revoked.png | Bin 714 -> 0 bytes .../status_signature_revoked_cutout.png | Bin 861 -> 0 bytes .../status_signature_revoked_cutout_24px.png | Bin 0 -> 861 bytes .../status_signature_revoked_cutout_96px.png | Bin 0 -> 3638 bytes .../res/drawable-hdpi/status_signature_unknown.png | Bin 640 -> 0 bytes .../status_signature_unknown_cutout.png | Bin 740 -> 0 bytes .../status_signature_unknown_cutout_24px.png | Bin 0 -> 740 bytes .../status_signature_unknown_cutout_96px.png | Bin 0 -> 2878 bytes .../drawable-hdpi/status_signature_unverified.png | Bin 536 -> 0 bytes .../status_signature_unverified_cutout.png | Bin 813 -> 0 bytes .../status_signature_unverified_cutout_24px.png | Bin 0 -> 813 bytes .../status_signature_unverified_cutout_96px.png | Bin 0 -> 3257 bytes .../drawable-hdpi/status_signature_verified.png | Bin 541 -> 0 bytes .../status_signature_verified_cutout.png | Bin 695 -> 0 bytes .../status_signature_verified_cutout_24px.png | Bin 0 -> 695 bytes .../status_signature_verified_cutout_96px.png | Bin 0 -> 3277 bytes .../res/drawable-mdpi/key_flag_authenticate.png | Bin 897 -> 0 bytes .../drawable-mdpi/key_flag_authenticate_24px.png | Bin 0 -> 897 bytes .../main/res/drawable-mdpi/key_flag_certify.png | Bin 1746 -> 0 bytes .../res/drawable-mdpi/key_flag_certify_24px.png | Bin 0 -> 1746 bytes .../main/res/drawable-mdpi/key_flag_encrypt.png | Bin 1153 -> 0 bytes .../res/drawable-mdpi/key_flag_encrypt_24px.png | Bin 0 -> 1153 bytes .../src/main/res/drawable-mdpi/key_flag_sign.png | Bin 1353 -> 0 bytes .../main/res/drawable-mdpi/key_flag_sign_24px.png | Bin 0 -> 1353 bytes .../main/res/drawable-mdpi/status_lock_closed.png | Bin 528 -> 0 bytes .../res/drawable-mdpi/status_lock_closed_24px.png | Bin 0 -> 528 bytes .../main/res/drawable-mdpi/status_lock_error.png | Bin 622 -> 0 bytes .../res/drawable-mdpi/status_lock_error_24px.png | Bin 0 -> 622 bytes .../main/res/drawable-mdpi/status_lock_open.png | Bin 522 -> 0 bytes .../res/drawable-mdpi/status_lock_open_24px.png | Bin 0 -> 522 bytes .../res/drawable-mdpi/status_signature_expired.png | Bin 601 -> 0 bytes .../status_signature_expired_cutout.png | Bin 643 -> 0 bytes .../status_signature_expired_cutout_24px.png | Bin 0 -> 643 bytes .../status_signature_expired_cutout_96px.png | Bin 0 -> 2411 bytes .../res/drawable-mdpi/status_signature_invalid.png | Bin 463 -> 0 bytes .../status_signature_invalid_cutout.png | Bin 410 -> 0 bytes .../status_signature_invalid_cutout_24px.png | Bin 0 -> 410 bytes .../status_signature_invalid_cutout_96px.png | Bin 0 -> 958 bytes .../res/drawable-mdpi/status_signature_revoked.png | Bin 613 -> 0 bytes .../status_signature_revoked_cutout.png | Bin 685 -> 0 bytes .../status_signature_revoked_cutout_24px.png | Bin 0 -> 685 bytes .../status_signature_revoked_cutout_96px.png | Bin 0 -> 2475 bytes .../res/drawable-mdpi/status_signature_unknown.png | Bin 517 -> 0 bytes .../status_signature_unknown_cutout.png | Bin 589 -> 0 bytes .../status_signature_unknown_cutout_24px.png | Bin 0 -> 589 bytes .../status_signature_unknown_cutout_96px.png | Bin 0 -> 2105 bytes .../drawable-mdpi/status_signature_unverified.png | Bin 469 -> 0 bytes .../status_signature_unverified_cutout.png | Bin 667 -> 0 bytes .../status_signature_unverified_cutout_24px.png | Bin 0 -> 667 bytes .../status_signature_unverified_cutout_96px.png | Bin 0 -> 2314 bytes .../drawable-mdpi/status_signature_verified.png | Bin 476 -> 0 bytes .../status_signature_verified_cutout.png | Bin 557 -> 0 bytes .../status_signature_verified_cutout_24px.png | Bin 0 -> 557 bytes .../status_signature_verified_cutout_96px.png | Bin 0 -> 2148 bytes .../res/drawable-xhdpi/key_flag_authenticate.png | Bin 2161 -> 0 bytes .../drawable-xhdpi/key_flag_authenticate_24px.png | Bin 0 -> 2161 bytes .../main/res/drawable-xhdpi/key_flag_certify.png | Bin 3713 -> 0 bytes .../res/drawable-xhdpi/key_flag_certify_24px.png | Bin 0 -> 3713 bytes .../main/res/drawable-xhdpi/key_flag_encrypt.png | Bin 2310 -> 0 bytes .../res/drawable-xhdpi/key_flag_encrypt_24px.png | Bin 0 -> 2310 bytes .../src/main/res/drawable-xhdpi/key_flag_sign.png | Bin 2705 -> 0 bytes .../main/res/drawable-xhdpi/key_flag_sign_24px.png | Bin 0 -> 2705 bytes .../main/res/drawable-xhdpi/status_lock_closed.png | Bin 911 -> 0 bytes .../res/drawable-xhdpi/status_lock_closed_24px.png | Bin 0 -> 911 bytes .../main/res/drawable-xhdpi/status_lock_error.png | Bin 1008 -> 0 bytes .../res/drawable-xhdpi/status_lock_error_24px.png | Bin 0 -> 1008 bytes .../main/res/drawable-xhdpi/status_lock_open.png | Bin 911 -> 0 bytes .../res/drawable-xhdpi/status_lock_open_24px.png | Bin 0 -> 911 bytes .../drawable-xhdpi/status_signature_expired.png | Bin 1049 -> 0 bytes .../status_signature_expired_cutout.png | Bin 1179 -> 0 bytes .../status_signature_expired_cutout_24px.png | Bin 0 -> 1179 bytes .../status_signature_expired_cutout_96px.png | Bin 0 -> 4973 bytes .../drawable-xhdpi/status_signature_invalid.png | Bin 736 -> 0 bytes .../status_signature_invalid_cutout.png | Bin 676 -> 0 bytes .../status_signature_invalid_cutout_24px.png | Bin 0 -> 676 bytes .../status_signature_invalid_cutout_96px.png | Bin 0 -> 2306 bytes .../drawable-xhdpi/status_signature_revoked.png | Bin 1033 -> 0 bytes .../status_signature_revoked_cutout.png | Bin 1218 -> 0 bytes .../status_signature_revoked_cutout_24px.png | Bin 0 -> 1218 bytes .../status_signature_revoked_cutout_96px.png | Bin 0 -> 5757 bytes .../drawable-xhdpi/status_signature_unknown.png | Bin 906 -> 0 bytes .../status_signature_unknown_cutout.png | Bin 1043 -> 0 bytes .../status_signature_unknown_cutout_24px.png | Bin 0 -> 1043 bytes .../status_signature_unknown_cutout_96px.png | Bin 0 -> 4395 bytes .../drawable-xhdpi/status_signature_unverified.png | Bin 706 -> 0 bytes .../status_signature_unverified_cutout.png | Bin 1166 -> 0 bytes .../status_signature_unverified_cutout_24px.png | Bin 0 -> 1166 bytes .../status_signature_unverified_cutout_96px.png | Bin 0 -> 4908 bytes .../drawable-xhdpi/status_signature_verified.png | Bin 784 -> 0 bytes .../status_signature_verified_cutout.png | Bin 1017 -> 0 bytes .../status_signature_verified_cutout_24px.png | Bin 0 -> 1017 bytes .../status_signature_verified_cutout_96px.png | Bin 0 -> 5309 bytes .../res/drawable-xxhdpi/key_flag_authenticate.png | Bin 3073 -> 0 bytes .../drawable-xxhdpi/key_flag_authenticate_24px.png | Bin 0 -> 3073 bytes .../main/res/drawable-xxhdpi/key_flag_certify.png | Bin 5303 -> 0 bytes .../res/drawable-xxhdpi/key_flag_certify_24px.png | Bin 0 -> 5303 bytes .../main/res/drawable-xxhdpi/key_flag_encrypt.png | Bin 3158 -> 0 bytes .../res/drawable-xxhdpi/key_flag_encrypt_24px.png | Bin 0 -> 3158 bytes .../src/main/res/drawable-xxhdpi/key_flag_sign.png | Bin 3765 -> 0 bytes .../res/drawable-xxhdpi/key_flag_sign_24px.png | Bin 0 -> 3765 bytes .../res/drawable-xxhdpi/status_lock_closed.png | Bin 1160 -> 0 bytes .../drawable-xxhdpi/status_lock_closed_24px.png | Bin 0 -> 1160 bytes .../main/res/drawable-xxhdpi/status_lock_error.png | Bin 1316 -> 0 bytes .../res/drawable-xxhdpi/status_lock_error_24px.png | Bin 0 -> 1316 bytes .../main/res/drawable-xxhdpi/status_lock_open.png | Bin 1165 -> 0 bytes .../res/drawable-xxhdpi/status_lock_open_24px.png | Bin 0 -> 1165 bytes .../drawable-xxhdpi/status_signature_expired.png | Bin 1429 -> 0 bytes .../status_signature_expired_cutout.png | Bin 1590 -> 0 bytes .../status_signature_expired_cutout_24px.png | Bin 0 -> 1590 bytes .../status_signature_expired_cutout_96px.png | Bin 0 -> 6986 bytes .../drawable-xxhdpi/status_signature_invalid.png | Bin 840 -> 0 bytes .../status_signature_invalid_cutout.png | Bin 694 -> 0 bytes .../status_signature_invalid_cutout_24px.png | Bin 0 -> 694 bytes .../status_signature_invalid_cutout_96px.png | Bin 0 -> 3701 bytes .../drawable-xxhdpi/status_signature_revoked.png | Bin 1353 -> 0 bytes .../status_signature_revoked_cutout.png | Bin 1660 -> 0 bytes .../status_signature_revoked_cutout_24px.png | Bin 0 -> 1660 bytes .../status_signature_revoked_cutout_96px.png | Bin 0 -> 7922 bytes .../drawable-xxhdpi/status_signature_unknown.png | Bin 1231 -> 0 bytes .../status_signature_unknown_cutout.png | Bin 1377 -> 0 bytes .../status_signature_unknown_cutout_24px.png | Bin 0 -> 1377 bytes .../status_signature_unknown_cutout_96px.png | Bin 0 -> 5952 bytes .../status_signature_unverified.png | Bin 946 -> 0 bytes .../status_signature_unverified_cutout.png | Bin 1555 -> 0 bytes .../status_signature_unverified_cutout_24px.png | Bin 0 -> 1555 bytes .../status_signature_unverified_cutout_96px.png | Bin 0 -> 6544 bytes .../drawable-xxhdpi/status_signature_verified.png | Bin 1012 -> 0 bytes .../status_signature_verified_cutout.png | Bin 1319 -> 0 bytes .../status_signature_verified_cutout_24px.png | Bin 0 -> 1319 bytes .../status_signature_verified_cutout_96px.png | Bin 0 -> 7353 bytes .../src/main/res/layout/certify_key_fragment.xml | 2 +- .../src/main/res/layout/decrypt_result_include.xml | 4 +- .../src/main/res/layout/import_keys_list_item.xml | 2 +- OpenKeychain/src/main/res/layout/key_list_item.xml | 2 +- .../src/main/res/layout/keyspinner_item.xml | 2 +- .../src/main/res/layout/select_key_item.xml | 2 +- .../src/main/res/layout/view_key_activity.xml | 32 +++++++----- .../main/res/layout/view_key_adv_main_fragment.xml | 2 +- .../main/res/layout/view_key_adv_subkey_item.xml | 10 ++-- .../src/main/res/layout/view_key_fragment.xml | 2 +- 166 files changed, 97 insertions(+), 53 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index d95866dd3..d80f4b7ca 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -48,13 +48,22 @@ inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" done -for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_expired" "status_signature_invalid_cutout" "status_signature_invalid" "status_signature_revoked_cutout" "status_signature_revoked" "status_signature_unknown_cutout" "status_signature_unknown" "status_signature_unverified_cutout" "status_signature_unverified" "status_signature_verified_cutout" "status_signature_verified" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" +for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" do echo $NAME -inkscape -w 24 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 32 -h 32 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 48 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 64 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +done + +for NAME in "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" +do +echo $NAME +inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 128 -h 128 -e "$HDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" done for NAME in "create_key_robot" diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 8ef5d01aa..ac1988d08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -406,7 +406,7 @@ public class ViewKeyActivity extends BaseActivity implements if (isRevoked) { mStatusText.setText(R.string.view_key_revoked); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_REVOKED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_REVOKED, R.color.icons, true); color = getResources().getColor(R.color.android_red_light); mActionEncryptFile.setVisibility(View.INVISIBLE); @@ -416,7 +416,7 @@ public class ViewKeyActivity extends BaseActivity implements } else if (isExpired) { mStatusText.setText(R.string.view_key_expired); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_EXPIRED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_EXPIRED, R.color.icons, true); color = getResources().getColor(R.color.android_red_light); mActionEncryptFile.setVisibility(View.INVISIBLE); @@ -439,7 +439,7 @@ public class ViewKeyActivity extends BaseActivity implements if (isVerified) { mStatusText.setText(R.string.view_key_verified); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_VERIFIED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_VERIFIED, R.color.icons, true); color = getResources().getColor(R.color.primary); AsyncTask photoTask = @@ -461,7 +461,7 @@ public class ViewKeyActivity extends BaseActivity implements } else { mStatusText.setText(R.string.view_key_unverified); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons, true); color = getResources().getColor(R.color.android_orange_light); mActionVerify.setVisibility(View.VISIBLE); @@ -472,6 +472,8 @@ public class ViewKeyActivity extends BaseActivity implements mStatusBar.setBackgroundColor(color); mBigToolbar.setBackgroundColor(color); + mStatusImage.setAlpha(80); + break; } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index a3bd4d470..ff5fbb49a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -272,12 +272,12 @@ public class SubkeysAdapter extends CursorAdapter { PorterDuff.Mode.SRC_IN); if (isRevoked) { - vStatus.setImageResource(R.drawable.status_signature_revoked_cutout); + vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24px); vStatus.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); } else if (isExpired) { - vStatus.setImageResource(R.drawable.status_signature_expired_cutout); + vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24px); vStatus.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 1c3dec629..38ed88b9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -395,19 +395,29 @@ public class KeyFormattingUtils { } public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, int state) { - setStatusImage(context, statusIcon, statusText, state, KeyFormattingUtils.DEFAULT_COLOR); + setStatusImage(context, statusIcon, statusText, state, KeyFormattingUtils.DEFAULT_COLOR, false); + } + + public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, + int state, int color) { + setStatusImage(context, statusIcon, statusText, state, color, false); } /** * Sets status image based on constant */ public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, - int state, int color) { + int state, int color, boolean big) { switch (state) { /** GREEN: everything is good **/ case STATE_VERIFIED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_verified_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; } @@ -420,7 +430,7 @@ public class KeyFormattingUtils { } case STATE_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_closed)); + context.getResources().getDrawable(R.drawable.status_lock_closed_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; } @@ -433,8 +443,13 @@ public class KeyFormattingUtils { } /** ORANGE: mostly bad... **/ case STATE_UNVERIFIED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; } @@ -447,7 +462,7 @@ public class KeyFormattingUtils { } case STATE_UNKNOWN_KEY: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; } @@ -460,8 +475,13 @@ public class KeyFormattingUtils { } /** RED: really bad... **/ case STATE_REVOKED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -473,8 +493,13 @@ public class KeyFormattingUtils { break; } case STATE_EXPIRED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_expired_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -487,7 +512,7 @@ public class KeyFormattingUtils { } case STATE_NOT_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_open)); + context.getResources().getDrawable(R.drawable.status_lock_open_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -500,7 +525,7 @@ public class KeyFormattingUtils { } case STATE_NOT_SIGNED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -513,7 +538,7 @@ public class KeyFormattingUtils { } case STATE_INVALID: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -527,7 +552,7 @@ public class KeyFormattingUtils { /** special **/ case STATE_UNAVAILABLE: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.bg_gray; } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png deleted file mode 100644 index 9d4ed6e84..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png new file mode 100644 index 000000000..9d4ed6e84 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png deleted file mode 100644 index e76393659..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png new file mode 100644 index 000000000..e76393659 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png deleted file mode 100644 index 3c2f8c09c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png new file mode 100644 index 000000000..3c2f8c09c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png deleted file mode 100644 index 046424643..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png new file mode 100644 index 000000000..046424643 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png deleted file mode 100644 index a1b090630..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png new file mode 100644 index 000000000..a1b090630 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png deleted file mode 100644 index e567055aa..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png new file mode 100644 index 000000000..e567055aa Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png deleted file mode 100644 index 98e32eadc..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png new file mode 100644 index 000000000..98e32eadc Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png deleted file mode 100644 index 21e8b536a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png deleted file mode 100644 index 84ac9bec2..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png new file mode 100644 index 000000000..84ac9bec2 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png new file mode 100644 index 000000000..63546068f Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png deleted file mode 100644 index 9ae2a09ab..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png deleted file mode 100644 index 967e00e80..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png new file mode 100644 index 000000000..967e00e80 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png new file mode 100644 index 000000000..9957db288 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png deleted file mode 100644 index 16e1d7181..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png deleted file mode 100644 index 244dd0708..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png new file mode 100644 index 000000000..244dd0708 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png new file mode 100644 index 000000000..1c3a15c07 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png deleted file mode 100644 index 5c3ba866d..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png deleted file mode 100644 index 82cc25a4b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png new file mode 100644 index 000000000..82cc25a4b Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png new file mode 100644 index 000000000..ce46c6317 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png deleted file mode 100644 index b8b472a5a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png deleted file mode 100644 index e752eaeab..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png new file mode 100644 index 000000000..e752eaeab Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png new file mode 100644 index 000000000..19ee3c241 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png deleted file mode 100644 index d8141b47b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png deleted file mode 100644 index 08a9f464c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png new file mode 100644 index 000000000..08a9f464c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png new file mode 100644 index 000000000..ed3db0aca Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png deleted file mode 100644 index ed1ba24d2..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png new file mode 100644 index 000000000..ed1ba24d2 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png deleted file mode 100644 index d54d461fa..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png new file mode 100644 index 000000000..d54d461fa Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png deleted file mode 100644 index 81c1b3dfa..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png new file mode 100644 index 000000000..81c1b3dfa Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png deleted file mode 100644 index 9afc43901..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png new file mode 100644 index 000000000..9afc43901 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png deleted file mode 100644 index cfc39f0e7..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png new file mode 100644 index 000000000..cfc39f0e7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png deleted file mode 100644 index 824dc2672..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png new file mode 100644 index 000000000..824dc2672 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png deleted file mode 100644 index 9bca59ae3..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png new file mode 100644 index 000000000..9bca59ae3 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png deleted file mode 100644 index 81a900147..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png deleted file mode 100644 index bc91094b5..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png new file mode 100644 index 000000000..bc91094b5 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png new file mode 100644 index 000000000..df385bb1b Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png deleted file mode 100644 index baa78f795..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png deleted file mode 100644 index bc2f56e2a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png new file mode 100644 index 000000000..bc2f56e2a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png new file mode 100644 index 000000000..aeb899599 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png deleted file mode 100644 index 7cf985274..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png deleted file mode 100644 index 2d2593194..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png new file mode 100644 index 000000000..2d2593194 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png new file mode 100644 index 000000000..d77c5e1c1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png deleted file mode 100644 index 3d4665320..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png deleted file mode 100644 index 0fc74d07e..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png new file mode 100644 index 000000000..0fc74d07e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png new file mode 100644 index 000000000..ee0661234 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png deleted file mode 100644 index 8348b32b3..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png deleted file mode 100644 index 96a2d1413..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png new file mode 100644 index 000000000..96a2d1413 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png new file mode 100644 index 000000000..1602747f1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png deleted file mode 100644 index 02e53ac8a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png deleted file mode 100644 index 9f7cf837c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png new file mode 100644 index 000000000..9f7cf837c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png new file mode 100644 index 000000000..61c23f749 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png deleted file mode 100644 index 8d36d7202..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png new file mode 100644 index 000000000..8d36d7202 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png deleted file mode 100644 index 01a74bcc0..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png new file mode 100644 index 000000000..01a74bcc0 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png deleted file mode 100644 index ff07bd0a4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png new file mode 100644 index 000000000..ff07bd0a4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png deleted file mode 100644 index b8002162a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png new file mode 100644 index 000000000..b8002162a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png deleted file mode 100644 index 7c6bb2d18..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png new file mode 100644 index 000000000..7c6bb2d18 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png deleted file mode 100644 index da4a5d89a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png new file mode 100644 index 000000000..da4a5d89a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png deleted file mode 100644 index cd02fc1e4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png new file mode 100644 index 000000000..cd02fc1e4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png deleted file mode 100644 index f5105c1ae..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png deleted file mode 100644 index 83f6fde35..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png new file mode 100644 index 000000000..83f6fde35 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png new file mode 100644 index 000000000..568b48c43 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png deleted file mode 100644 index 67880d6db..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png deleted file mode 100644 index 29830f5ba..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png new file mode 100644 index 000000000..29830f5ba Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png new file mode 100644 index 000000000..89f899212 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png deleted file mode 100644 index 2ed67419b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png deleted file mode 100644 index 2f7695043..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png new file mode 100644 index 000000000..2f7695043 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png new file mode 100644 index 000000000..3db663e2e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png deleted file mode 100644 index a6f1f2792..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png deleted file mode 100644 index 2ce28c7ca..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png new file mode 100644 index 000000000..2ce28c7ca Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png new file mode 100644 index 000000000..4e0e04375 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png deleted file mode 100644 index c25a84b4d..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png deleted file mode 100644 index 442c55eee..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png new file mode 100644 index 000000000..442c55eee Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png new file mode 100644 index 000000000..0b2ccc9f7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png deleted file mode 100644 index 6f435a85e..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png deleted file mode 100644 index 160ec7cbe..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png new file mode 100644 index 000000000..160ec7cbe Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png new file mode 100644 index 000000000..471e5e513 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png deleted file mode 100644 index d786dc72f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png new file mode 100644 index 000000000..d786dc72f Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png deleted file mode 100644 index 4bb97f992..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png new file mode 100644 index 000000000..4bb97f992 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png deleted file mode 100644 index fe0c8e41b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png new file mode 100644 index 000000000..fe0c8e41b Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png deleted file mode 100644 index 51ab367a9..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png new file mode 100644 index 000000000..51ab367a9 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png deleted file mode 100644 index 5a9664d59..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png new file mode 100644 index 000000000..5a9664d59 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png deleted file mode 100644 index 608f065af..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png new file mode 100644 index 000000000..608f065af Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png deleted file mode 100644 index ee34dd396..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png new file mode 100644 index 000000000..ee34dd396 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png deleted file mode 100644 index f475c9d84..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png deleted file mode 100644 index 33a3efed1..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png new file mode 100644 index 000000000..33a3efed1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png new file mode 100644 index 000000000..ba7e8c2f4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png deleted file mode 100644 index f21c2cf52..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png deleted file mode 100644 index bc39d3496..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png new file mode 100644 index 000000000..bc39d3496 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png new file mode 100644 index 000000000..1fbf5ceb2 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png deleted file mode 100644 index be1a1d9dc..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png deleted file mode 100644 index 58929661f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png new file mode 100644 index 000000000..58929661f Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png new file mode 100644 index 000000000..338c696ac Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png deleted file mode 100644 index 841cfa958..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png deleted file mode 100644 index 3020357a4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png new file mode 100644 index 000000000..3020357a4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png new file mode 100644 index 000000000..2690310a6 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png deleted file mode 100644 index 525d1cf6b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png deleted file mode 100644 index 3829bb3a0..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png new file mode 100644 index 000000000..3829bb3a0 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png new file mode 100644 index 000000000..e559faf9d Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png deleted file mode 100644 index 54eee5ba0..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png deleted file mode 100644 index 3548ee2b6..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png new file mode 100644 index 000000000..3548ee2b6 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png new file mode 100644 index 000000000..79e4ec4a9 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png differ diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index a55a8ea0c..2df3755a4 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 9140ad07b..659d1c207 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -24,7 +24,7 @@ android:id="@+id/result_encryption_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/status_lock_open" + android:src="@drawable/status_lock_open_24px" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index b75bb808e..757dae5be 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml index c7fa882cb..13f63d2ee 100644 --- a/OpenKeychain/src/main/res/layout/select_key_item.xml +++ b/OpenKeychain/src/main/res/layout/select_key_item.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index ad46a8d62..9b055d322 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -53,19 +53,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - @@ -98,12 +89,15 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="32dp"> + android:layout_marginLeft="32dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"> @@ -111,6 +105,7 @@ android:id="@+id/view_key_action_encrypt_text" android:layout_width="64dp" android:layout_height="64dp" + android:visibility="invisible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_action_encrypt_text" /> @@ -123,6 +118,18 @@ android:src="@drawable/ic_action_verified_cutout" /> + + diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml index b2875b9e6..f41109d84 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="8dp" android:layout_centerVertical="true" android:layout_alignParentStart="true" /> @@ -71,7 +71,7 @@ android:id="@+id/subkey_item_ic_certify" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_certify" + android:src="@drawable/key_flag_certify_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -79,7 +79,7 @@ android:id="@+id/subkey_item_ic_sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_sign" + android:src="@drawable/key_flag_sign_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -87,7 +87,7 @@ android:id="@+id/subkey_item_ic_encrypt" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_encrypt" + android:src="@drawable/key_flag_encrypt_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -95,7 +95,7 @@ android:id="@+id/subkey_item_ic_authenticate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_authenticate" + android:src="@drawable/key_flag_authenticate_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index fadad0e56..790d4143e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> -- cgit v1.2.3