commit 565e33c6080fc6867ccb53ab740d1f17e6b77280
author Ihab Awad <ihab@google.com> Mon Dec 01 16:24:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 16:24:34 2014 +0000
tree 3ccb79e9fb15fceadf18227f4961fbf78daea1e0
parent ce5effba809645c61574ebf186619b6f2e422d94
parent e80b9c19c70c3d18732d77fa6d56283dfecbe58d

Merge "Telecom API updates (2/6)" into lmp-mr1-dev

src/com/android/dialer/PhoneCallDetailsHelper.java

diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index 2e1651a..b4e8171 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -115,7 +115,7 @@
             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 {

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

diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 2eaf949..3979a3e 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -73,7 +73,7 @@
      */
     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();
     }
 
     /**