summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/widget
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-09-19 09:59:10 -0700
committerChris Craik <ccraik@google.com>2014-09-19 09:59:10 -0700
commitc95fbc9827f479f8ba500ba99acb361379328424 (patch)
tree17e29e2c80b3965679d571b25a0c1878bb202e31 /src/com/android/contacts/widget
parent03a77660087483b981e9ddf32060a472c231867f (diff)
downloadpackages_apps_Contacts-c95fbc9827f479f8ba500ba99acb361379328424.tar.gz
packages_apps_Contacts-c95fbc9827f479f8ba500ba99acb361379328424.tar.bz2
packages_apps_Contacts-c95fbc9827f479f8ba500ba99acb361379328424.zip
Remove use of ColorMatrixColorFilter.setColorMatrix
bug:17262092 Change-Id: I47214486e0b82f01b8babcac4f2f945f233e761d
Diffstat (limited to 'src/com/android/contacts/widget')
-rw-r--r--src/com/android/contacts/widget/MultiShrinkScroller.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 570a24b58..bba8a9368 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -142,8 +142,6 @@ public class MultiShrinkScroller extends FrameLayout {
// Objects used to perform color filtering on the header. These are stored as fields for
// the sole purpose of avoiding "new" operations inside animation loops.
private final ColorMatrix mWhitenessColorMatrix = new ColorMatrix();
- private final ColorMatrixColorFilter mColorFilter = new ColorMatrixColorFilter(
- mWhitenessColorMatrix);
private final ColorMatrix mColorMatrix = new ColorMatrix();
private final float[] mAlphaMatrixValues = {
0, 0, 0, 0, 0,
@@ -1116,8 +1114,7 @@ public class MultiShrinkScroller extends FrameLayout {
mColorMatrix.postConcat(multiplyBlendMatrix(mHeaderTintColor, colorAlpha));
}
- mColorFilter.setColorMatrix(mColorMatrix);
- mPhotoView.setColorFilter(mColorFilter);
+ mPhotoView.setColorFilter(new ColorMatrixColorFilter(mColorMatrix));
// Tell the photo view what tint we are trying to achieve. Depending on the type of
// drawable used, the photo view may or may not use this tint.
mPhotoView.setTint(mHeaderTintColor);