From 15992ac1aba12271f185a9d842f9b91f14202127 Mon Sep 17 00:00:00 2001 From: Nancy Chen Date: Wed, 12 Nov 2014 09:18:19 -0800 Subject: 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 --- InCallUI/src/com/android/incallui/InCallPresenter.java | 6 +++--- .../src/com/android/incallui/InCallUIMaterialColorMapUtils.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'InCallUI/src') 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; } -- cgit v1.2.3