diff options
| author | Ihab Awad <ihab@google.com> | 2014-12-01 19:59:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 19:59:54 +0000 |
| commit | e1077eefc3d76a376b4948fe50b3f293683f93f9 (patch) | |
| tree | 722afd5f3eb8e540f8beedffeb63eebb14be532f | |
| parent | a86db52a75776d2c160814bb02f588ab128d96a4 (diff) | |
| parent | 193c7f9b94efb207d8104abdfa81e99576f16b52 (diff) | |
am 193c7f9b: am 3509eeca: am 565e33c6: Merge "Telecom API updates (2/6)" into lmp-mr1-dev
* commit '193c7f9b94efb207d8104abdfa81e99576f16b52':
Telecom API updates (2/6)
| -rw-r--r-- | src/com/android/dialer/PhoneCallDetailsHelper.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index 2e1651a70..b4e817174 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -115,7 +115,7 @@ public class PhoneCallDetailsHelper { views.callAccountLabel.setVisibility(View.VISIBLE); views.callAccountLabel.setText(accountLabel); int color = PhoneAccountUtils.getAccountColor(mContext, details.accountHandle); - if (color == PhoneAccount.NO_COLOR) { + if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) { int defaultColor = R.color.dialtacts_secondary_text_color; views.callAccountLabel.setTextColor(mContext.getResources().getColor(defaultColor)); } else { diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index 2eaf94937..3979a3e5e 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -73,7 +73,7 @@ public class PhoneAccountUtils { */ public static int getAccountColor(Context context, PhoneAccountHandle accountHandle) { PhoneAccount account = getAccountOrNull(context, accountHandle); - return account == null ? PhoneAccount.NO_COLOR : account.getHighlightColor(); + return account == null ? PhoneAccount.NO_HIGHLIGHT_COLOR : account.getHighlightColor(); } /** |