Use the highlight color instead of the tint color

The tint color of a phone account only refers to the color of the icon,
the highlight color is the general display color used for text,
backgrounds etc. We should use highlight color in InCallUI
Also minor color updates (lightening the "dark" version a little)

Bug: 18192071

Change-Id: I4078897bcb871326a4806f64355a67c5b267e9e6

3 files changed, 10 insertions, 10 deletions

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 05c2cf139..0308c9b76 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -96,11 +96,11 @@
     <!-- Darker versions of background_colors, two shades darker. These colors are used for the
          status bar. -->
     <array name="background_colors_dark">
-        <item>#004D40</item>
-        <item>#1C3AA9</item>
-        <item>#1A237E</item>
-        <item>#4A148C</item>
-        <item>#880E4F</item>
-        <item>#A52714</item>
+        <item>#00695C</item>
+        <item>#2A56C6</item>
+        <item>#283593</item>
+        <item>#6A1B9A</item>
+        <item>#AD1457</item>
+        <item>#B93221</item>
     </array>
 </resources>
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 8b096d044..4432018f8 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -1168,18 +1168,18 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
         Call call = CallList.getInstance().getFirstCall();
         TelecomManager tm = getTelecomManager();
 
-        int iconTint = PhoneAccount.NO_COLOR;
+        int highlightColor = PhoneAccount.NO_COLOR;
 
         if (call != null && tm != null && tm.hasMultipleCallCapableAccounts()) {
             PhoneAccount account = tm.getPhoneAccount(call.getAccountHandle());
             if (account != null) {
-                iconTint = account.getIconTint();
+                highlightColor = account.getHighlightColor();
             }
         }
 
         // This method will set the background to default if the color is PhoneAccount.NO_COLOR.
         mThemeColors = new InCallUIMaterialColorMapUtils(mContext.getResources()).
-                calculatePrimaryAndSecondaryColor(iconTint);
+                calculatePrimaryAndSecondaryColor(highlightColor);
 
         mInCallActivity.getWindow().setStatusBarColor(mThemeColors.mSecondaryColor);
     }
diff --git a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
index efab45f21..ca4f9b7ec 100644
--- a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
+++ b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
@@ -17,7 +17,7 @@ public class InCallUIMaterialColorMapUtils extends MaterialColorMapUtils {
         sPrimaryColors = resources.obtainTypedArray(
                 com.android.incallui.R.array.background_colors);
         sSecondaryColors = resources.obtainTypedArray(
-                com.android.contacts.common.R.array.background_colors_dark);
+                com.android.incallui.R.array.background_colors_dark);
         mResources = resources;
     }