Remove hidden PorterDuffColorFilter#getColor call
This method might be unhidden in MNC. I don't want to wait.
Bug: 18777272
Change-Id: I50dbae3982e5f048b5080a707eeddd0fed0a5aac
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index de2a6ec..31a0c50 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -246,6 +246,7 @@
private Contact mContactData;
private ContactLoader mContactLoader;
private PorterDuffColorFilter mColorFilter;
+ private int mColorFilterColor;
private final ImageViewDrawableSetter mPhotoSetter = new ImageViewDrawableSetter();
@@ -780,7 +781,7 @@
public void onSaveInstanceState(Bundle savedInstanceState) {
super.onSaveInstanceState(savedInstanceState);
if (mColorFilter != null) {
- savedInstanceState.putInt(KEY_THEME_COLOR, mColorFilter.getColor());
+ savedInstanceState.putInt(KEY_THEME_COLOR, mColorFilterColor);
}
}
@@ -1832,16 +1833,16 @@
private void setThemeColor(MaterialPalette palette) {
// If the color is invalid, use the predefined default
- final int primaryColor = palette.mPrimaryColor;
- mScroller.setHeaderTintColor(primaryColor);
+ mColorFilterColor = palette.mPrimaryColor;
+ mScroller.setHeaderTintColor(mColorFilterColor);
mStatusBarColor = palette.mSecondaryColor;
updateStatusBarColor();
mColorFilter =
- new PorterDuffColorFilter(primaryColor, PorterDuff.Mode.SRC_ATOP);
- mContactCard.setColorAndFilter(primaryColor, mColorFilter);
- mRecentCard.setColorAndFilter(primaryColor, mColorFilter);
- mAboutCard.setColorAndFilter(primaryColor, mColorFilter);
+ new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP);
+ mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter);
+ mRecentCard.setColorAndFilter(mColorFilterColor, mColorFilter);
+ mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter);
}
private void updateStatusBarColor() {