Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a03099 authored by Brandon Maxwell's avatar Brandon Maxwell
Browse files

Making calls to Resources.getColor backwards compat 

Bug: 25776171
Change-Id: Id567c28af9e2578036c9db97389f66093198de09
parent 13cd2ced

src/com/android/dialer/calllog/PhoneCallDetailsHelper.java

+3 −3
Original line number Diff line number Diff line
@@ -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));

    }



    /**

src/com/android/dialer/filterednumber/BlockedNumbersFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -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);