From 18a827eeed042ffb43338e06f408b78b0a6a3394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 5 Mar 2015 11:06:17 +0100 Subject: Design fixes for decryption screen --- .../sufficientlysecure/keychain/ui/DecryptFragment.java | 2 +- .../src/main/res/drawable-hdpi/ic_action_accounts.png | Bin 669 -> 0 bytes .../src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 391 bytes .../src/main/res/drawable-mdpi/ic_action_accounts.png | Bin 499 -> 0 bytes .../src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 301 bytes .../src/main/res/drawable-xhdpi/ic_action_accounts.png | Bin 827 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 463 bytes .../src/main/res/drawable-xxhdpi/ic_action_accounts.png | Bin 1212 -> 0 bytes .../main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 714 bytes .../src/main/res/drawable-xxxhdpi/ic_action_accounts.png | Bin 1663 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 825 bytes .../src/main/res/layout/decrypt_result_include.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 2 +- 13 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 7d8fd1388..60103f344 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -243,7 +243,7 @@ public abstract class DecryptFragment extends Fragment { private void setShowAction(final long signatureKeyId) { mSignatureAction.setText(R.string.decrypt_result_action_show); - mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_accounts, 0); + mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_vpn_key_grey_24dp, 0); mSignatureLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png deleted file mode 100644 index 10c77d07d..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 000000000..cbc93ca36 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png deleted file mode 100644 index 41b89b5b6..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 000000000..7acfab4f4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png deleted file mode 100644 index ee8067c7d..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 000000000..49a44704c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png deleted file mode 100644 index d9b5cc007..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 000000000..6e1aa32c4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png deleted file mode 100644 index be1bc9ef4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 000000000..2ea2bf77c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 7317e7742..9d47009b9 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="Show" - android:drawableRight="@drawable/ic_action_accounts" + android:drawableRight="@drawable/ic_vpn_key_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 88eb89ec6..207553620 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1002,7 +1002,7 @@ "Encountered OpenPGP Exception during operation!" "Integrity check OK!" "Only metadata was requested, skipping decryption" - "OK" + "Decryption/Verification finished" "Using passphrase from cache" "NFC token required, requesting user input…" "Passphrase required, requesting user input…" -- cgit v1.2.3