From d4a030993c4485a821313ed1ecdd6dfd7bdba6f6 Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Fri, 20 Nov 2015 17:35:40 -0800 Subject: Making calls to Resources.getColor backwards compat Bug: 25776171 Change-Id: Id567c28af9e2578036c9db97389f66093198de09 --- src/com/android/dialer/calllog/PhoneCallDetailsHelper.java | 6 +++--- src/com/android/dialer/filterednumber/BlockedNumbersFragment.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/dialer/calllog/PhoneCallDetailsHelper.java b/src/com/android/dialer/calllog/PhoneCallDetailsHelper.java index 96dbf8219..4d201b07b 100644 --- a/src/com/android/dialer/calllog/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/calllog/PhoneCallDetailsHelper.java @@ -24,6 +24,7 @@ import android.content.res.Resources; import android.graphics.Typeface; import android.provider.CallLog.Calls; import android.provider.ContactsContract.CommonDataKinds.Phone; +import android.support.v4.content.ContextCompat; import android.telecom.PhoneAccount; import android.text.TextUtils; import android.text.format.DateUtils; @@ -152,9 +153,8 @@ public class PhoneCallDetailsHelper { views.nameView.setTypeface(typeface); views.voicemailTranscriptionView.setTypeface(typeface); views.callLocationAndDate.setTypeface(typeface); - views.callLocationAndDate.setTextColor(mResources.getColor( - details.isRead ? R.color.call_log_detail_color : R.color.call_log_unread_text_color, - mContext.getTheme())); + views.callLocationAndDate.setTextColor(ContextCompat.getColor(mContext, details.isRead ? + R.color.call_log_detail_color : R.color.call_log_unread_text_color)); } /** diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java index 6b3f18a79..073aac2fb 100644 --- a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java +++ b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java @@ -63,8 +63,8 @@ public class BlockedNumbersFragment extends ListFragment ImageView addNumberIcon = (ImageView) getActivity().findViewById(R.id.add_number_icon); LetterTileDrawable drawable = new LetterTileDrawable(getResources()); drawable.setLetter(ADD_BLOCKED_NUMBER_ICON_LETTER); - drawable.setColor(getResources().getColor(R.color.add_blocked_number_icon_color, - getActivity().getTheme())); + drawable.setColor(ActivityCompat.getColor(getActivity(), + R.color.add_blocked_number_icon_color)); drawable.setIsCircular(true); addNumberIcon.setImageDrawable(drawable); -- cgit v1.2.3