diff options
| author | Nancy Chen <nancychen@google.com> | 2014-11-12 23:49:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 23:49:52 +0000 |
| commit | 7f8f9dd93de4ec6026755568e793a9c4e3ed6548 (patch) | |
| tree | d7aefaebe5b0431497b733e894c10c1c56b483b1 | |
| parent | 42f19898136bdf07fc38586d70a6f14711997864 (diff) | |
| parent | 7f77489fe800158b549371a0c34abad4cf48fd47 (diff) | |
am 529a4b36: am a312c8e4: Use the highlight color instead of the tint color
* commit '529a4b3692353a47b606489b27f289a756d07543':
Use the highlight color instead of the tint color
| -rw-r--r-- | InCallUI/res/values/colors.xml | 12 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 6 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java | 2 |
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; } |