diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index b1d4c7a0e..ae2914a89 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -34,6 +34,7 @@ python copy OpenKeychain navigation grey close 24
python copy OpenKeychain social grey person 24
python copy OpenKeychain social grey person_add 24
python copy OpenKeychain social grey share 24
+python copy OpenKeychain action grey help 24
# navigation drawer sections
python copy OpenKeychain communication black vpn_key 24
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 ff5fbb49a..096dea51f 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_24px);
+ vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24dp);
vStatus.setColorFilter(
mContext.getResources().getColor(R.color.bg_gray),
PorterDuff.Mode.SRC_IN);
} else if (isExpired) {
- vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24px);
+ vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24dp);
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 38ed88b9c..3a2177e8d 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
@@ -413,10 +413,10 @@ public class KeyFormattingUtils {
case STATE_VERIFIED: {
if (big) {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px));
+ context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96dp));
} else {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24dp));
}
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_green_light;
@@ -430,7 +430,7 @@ public class KeyFormattingUtils {
}
case STATE_ENCRYPTED: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_lock_closed_24px));
+ context.getResources().getDrawable(R.drawable.status_lock_closed_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_green_light;
}
@@ -445,10 +445,10 @@ public class KeyFormattingUtils {
case STATE_UNVERIFIED: {
if (big) {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px));
+ context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96dp));
} else {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24dp));
}
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_orange_light;
@@ -462,7 +462,7 @@ public class KeyFormattingUtils {
}
case STATE_UNKNOWN_KEY: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_orange_light;
}
@@ -477,10 +477,10 @@ public class KeyFormattingUtils {
case STATE_REVOKED: {
if (big) {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px));
+ context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96dp));
} else {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24dp));
}
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_red_light;
@@ -495,10 +495,10 @@ public class KeyFormattingUtils {
case STATE_EXPIRED: {
if (big) {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px));
+ context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96dp));
} else {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24dp));
}
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_red_light;
@@ -512,7 +512,7 @@ public class KeyFormattingUtils {
}
case STATE_NOT_ENCRYPTED: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_lock_open_24px));
+ context.getResources().getDrawable(R.drawable.status_lock_open_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_red_light;
}
@@ -525,7 +525,7 @@ public class KeyFormattingUtils {
}
case STATE_NOT_SIGNED: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_red_light;
}
@@ -538,7 +538,7 @@ public class KeyFormattingUtils {
}
case STATE_INVALID: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.android_red_light;
}
@@ -552,7 +552,7 @@ public class KeyFormattingUtils {
/** special **/
case STATE_UNAVAILABLE: {
statusIcon.setImageDrawable(
- context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
+ context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp));
if (color == KeyFormattingUtils.DEFAULT_COLOR) {
color = R.color.bg_gray;
}
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png
deleted file mode 100644
index 1e397ebed..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png
deleted file mode 100644
index 1cbd993a7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png
new file mode 100644
index 000000000..e2779ba95
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png
deleted file mode 100644
index 06a054160..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png
deleted file mode 100644
index 97cb03def..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png
new file mode 100644
index 000000000..2f086e41a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png
deleted file mode 100644
index 5f528864d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png
deleted file mode 100644
index f8867e922..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey_24dp.png
new file mode 100644
index 000000000..5f01b9362
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png
deleted file mode 100644
index c77329563..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png
deleted file mode 100644
index 15650500d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png
new file mode 100644
index 000000000..d64fa5160
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png
new file mode 100644
index 000000000..8fc671147
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 2a2dee32c..8f9709711 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -30,7 +30,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
- style="@style/SelectableItem" />
+ style="?android:attr/borderlessButtonStyle" />
Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
-
Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
-
Expired: This key is no longer valid. Only the owner can extend its validity.
-
Revoked: This key is no longer valid. It has been revoked by its owner.
Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
+
Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
+
Expired: This key is no longer valid. Only the owner can extend its validity.
+
Revoked: This key is no longer valid. It has been revoked by its owner.
A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.