diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-30 20:45:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-29 21:36:00 +0000 |
commit | 240cc2a13c80a8246421cbd41ceaea7d18b2bafc (patch) | |
tree | 64757fd39444782c56bc7799637a0bc2da7b88a1 /InCallUI | |
parent | 75dec7e7bf2814c19dddabf5950aa185363c2afc (diff) | |
parent | 2d1f3d36d4cd9c01dafdac1e5a4e074f54542dd4 (diff) |
Merge "Update InCallUI colors for top toolbar and dialpad digits" into lmp-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/values/colors.xml | 5 | ||||
-rw-r--r-- | InCallUI/res/values/styles.xml | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index a55be56e3..faf27e676 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -29,9 +29,6 @@ <color name="incall_banner_secondary_background_color">#f5f5f5</color> <color name="incall_banner_secondary_text_color">#808080</color> - <!-- Color of the theme of the People app --> - <color name="people_app_theme_color">#33B5E5</color> - <!-- Put on top of each photo, implying 80% darker than usual. --> <color name="on_hold_dim_effect">#cc000000</color> @@ -41,7 +38,7 @@ <color name="end_call_touch_feedback_tint">#dddddd</color> <!-- Color of dialpad digits --> - <color name="dialpad_digits_text_color">#000000</color> + <color name="dialpad_digits_text_color">#333</color> <color name="incall_dialpad_background">#ffffff</color> <color name="incall_dialpad_background_pressed">#ccaaaaaa</color> diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index b2231da66..06aeb8738 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -123,7 +123,7 @@ <item name="android:windowNoTitle">true</item> <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item> <item name="android:textColorPrimary">@color/incall_call_banner_text_color</item> - <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item> + <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item> </style> |