commit e6c8d3d91b48fefe840f953a44179e224386b107
author Nancy Chen <nancychen@google.com> Thu Nov 13 02:12:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 13 02:12:42 2014 +0000
tree 37f622f19e9c2d84ffca2c2e46b4b3a5666ad7d7
parent 4435d37eb2c0ee16900aba38edf694e5f3f5400b
parent ac2b5e9377123426ad9d5808586be866eb686f4e

am ac2b5e93: am a91c8003: am 00f44af6: Merge "Use the highlight color instead of the tint color" into lmp-mr1-dev

* commit 'ac2b5e9377123426ad9d5808586be866eb686f4e':
  Use the highlight color instead of the tint color

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 4f85abf..2eaf949 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.getIconTint();
+        return account == null ? PhoneAccount.NO_COLOR : account.getHighlightColor();
     }
 
     /**