Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java

3 files changed, 9 insertions, 9 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
index 71a3673f2..3b0860fa9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
@@ -162,17 +162,17 @@ public class LinkedIdCreateDnsStep2Fragment extends Fragment {
         mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE);
         if (success == null) {
             mVerifyStatus.setText(R.string.linked_verifying);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
                     PorterDuff.Mode.SRC_IN);
         } else if (success) {
             mVerifyStatus.setText(R.string.linked_verify_success);
-            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
                     PorterDuff.Mode.SRC_IN);
         } else {
             mVerifyStatus.setText(R.string.linked_verify_error);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
                     PorterDuff.Mode.SRC_IN);
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
index 78c7caf53..7d2f3dfdb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
@@ -165,17 +165,17 @@ public class LinkedIdCreateHttpsStep2Fragment extends Fragment {
         mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE);
         if (success == null) {
             mVerifyStatus.setText(R.string.linked_verifying);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
                     PorterDuff.Mode.SRC_IN);
         } else if (success) {
             mVerifyStatus.setText(R.string.linked_verify_success);
-            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
                     PorterDuff.Mode.SRC_IN);
         } else {
             mVerifyStatus.setText(R.string.linked_verify_error);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
                     PorterDuff.Mode.SRC_IN);
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
index f395807cf..d298e8251 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
@@ -144,17 +144,17 @@ public class LinkedIdCreateTwitterStep3Fragment extends Fragment {
         mVerifyImage.setVisibility(on ?  View.GONE : View.VISIBLE);
         if (success == null) {
             mVerifyStatus.setText(R.string.linked_verifying);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
                     PorterDuff.Mode.SRC_IN);
         } else if (success) {
             mVerifyStatus.setText(R.string.linked_verify_success);
-            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
                     PorterDuff.Mode.SRC_IN);
         } else {
             mVerifyStatus.setText(R.string.linked_verify_error);
-            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
+            mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24dp);
             mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
                     PorterDuff.Mode.SRC_IN);
         }