diff options
| author | Ihab Awad <ihab@google.com> | 2014-12-01 16:29:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 16:29:37 +0000 |
| commit | 3509eeca95180fbbef12a4d7ad5b51abd2a9c48d (patch) | |
| tree | 3ccb79e9fb15fceadf18227f4961fbf78daea1e0 | |
| parent | 4ad916ec4a34d18ab6ad35f1fbfb7a73de30ba24 (diff) | |
| parent | 565e33c6080fc6867ccb53ab740d1f17e6b77280 (diff) | |
am 565e33c6: Merge "Telecom API updates (2/6)" into lmp-mr1-dev
* commit '565e33c6080fc6867ccb53ab740d1f17e6b77280':
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(); } /** |