diff options
| author | Victor Hazali <victorhazali@gmail.com> | 2016-04-04 18:52:22 +0800 |
|---|---|---|
| committer | Victor Hazali <victorhazali@gmail.com> | 2016-04-04 18:52:22 +0800 |
| commit | db3e90821cfff9ac8fe369fdcbbf8ce7e708ba15 (patch) | |
| tree | ca26e8c523e3ff59e039e03c8ed173aa991bf371 /OpenKeychain | |
| parent | 8f4238df28bea3473fb1414f64ad959368575e28 (diff) | |
| download | open-keychain-db3e90821cfff9ac8fe369fdcbbf8ce7e708ba15.tar.gz open-keychain-db3e90821cfff9ac8fe369fdcbbf8ce7e708ba15.tar.bz2 open-keychain-db3e90821cfff9ac8fe369fdcbbf8ce7e708ba15.zip | |
Used a constant instead of magic number for colour
Explicitly stated the blending mode
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 1 |
2 files changed, 3 insertions, 1 deletions
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 6c96a40ba..d81797454 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -33,6 +33,7 @@ import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.Color; +import android.graphics.PorterDuff; import android.net.Uri; import android.nfc.NfcAdapter; import android.os.AsyncTask; @@ -924,7 +925,7 @@ public class ViewKeyActivity extends BaseSecurityTokenNfcActivity implements } mPhoto.setImageBitmap(photo); - mPhoto.setColorFilter(Color.argb(30, 120, 166, 69)); + mPhoto.setColorFilter(getResources().getColor(R.color.toolbar_photo_tint), PorterDuff.Mode.SRC_ATOP); mPhotoLayout.setVisibility(View.VISIBLE); } }; diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 93cf126f7..d9075b587 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -35,5 +35,6 @@ <!-- linked ID view --> <color name="card_view_button">#7bad45</color> + <color name="toolbar_photo_tint">#1E7bad45</color> </resources> |