diff options
| author | Vincent <valodim@mugenguild.com> | 2016-04-06 15:33:03 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-04-06 15:33:03 +0200 |
| commit | 88ba5688d8e110fc6676c701359bb2bbca7efb77 (patch) | |
| tree | a6035583e0a70a441742654fb2436e1935aa0aee /OpenKeychain/src | |
| parent | d0a424f9f273f5a651c910ac24c934e523d5f737 (diff) | |
| parent | db3e90821cfff9ac8fe369fdcbbf8ce7e708ba15 (diff) | |
| download | open-keychain-88ba5688d8e110fc6676c701359bb2bbca7efb77.tar.gz open-keychain-88ba5688d8e110fc6676c701359bb2bbca7efb77.tar.bz2 open-keychain-88ba5688d8e110fc6676c701359bb2bbca7efb77.zip | |
Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar
tint linked contact picture in toolbar #1298
Diffstat (limited to 'OpenKeychain/src')
| -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, 4 insertions, 0 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 35c1615c7..d81797454 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -32,6 +32,8 @@ import android.app.ActivityOptions; 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; @@ -923,6 +925,7 @@ public class ViewKeyActivity extends BaseSecurityTokenNfcActivity implements } mPhoto.setImageBitmap(photo); + 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> |