diff options
| author | Nancy Chen <nancychen@google.com> | 2014-07-24 23:52:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 23:52:01 +0000 |
| commit | 955b94c31a3aa84a8514783b783cb9c8a49d1a47 (patch) | |
| tree | d91801ba201be9b38e9668a2ba11fdb3ef882b0b /InCallUI | |
| parent | 15a13aa01a9c4bae4d7db148ec02bfb6497462aa (diff) | |
| parent | 4796020d6d7b7a110713a39e7d33270f3951efa0 (diff) | |
am 13d10b65: am 208fe1ef: am 189be8d4: Merge "Update InCallUI colors to match mocks" into lmp-dev
* commit '13d10b656394a52e72369604f836b558640a34fe':
Update InCallUI colors to match mocks
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/values/colors.xml | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index bbb79722d..474a3aaa9 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -47,6 +47,7 @@ android:layout_marginRight="4dp" android:baselineAlignBottom="true" android:tint="@color/incall_accent_color" + android:alpha="0.7" android:scaleType="centerInside" android:visibility="gone" /> @@ -56,6 +57,7 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/incall_accent_color" android:textSize="@dimen/call_status_text_size" + android:alpha="0.7" android:singleLine="true" android:gravity="start" android:ellipsize="end" /> diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index a40921d8d..a55be56e3 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -18,13 +18,14 @@ <resources> <!-- In-call UI background color. --> - <color name="incall_background_color">#0fc6dc</color> - <color name="incall_accent_color">#eeff41</color> + <color name="incall_background_color">@color/dialer_theme_color</color> + <color name="incall_accent_color">#ffffff</color> <!-- Background color of main banner. --> <color name="incall_call_banner_background_color">@color/incall_background_color</color> <color name="incall_call_banner_text_color">#ffffff</color> - <color name="incall_call_banner_subtext_color">#b2ebf2</color> + <!-- 80% opacity, white --> + <color name="incall_call_banner_subtext_color">#ccffffff</color> <color name="incall_banner_secondary_background_color">#f5f5f5</color> <color name="incall_banner_secondary_text_color">#808080</color> @@ -46,14 +47,14 @@ <color name="incall_dialpad_background_pressed">#ccaaaaaa</color> <color name="button_background_color">@color/incall_background_color</color> - <color name="button_selected_color">#00acc1</color> + <color name="button_selected_color">@color/dialer_theme_color_dark</color> <!-- 70% opacity, white. --> <color name="button_default_color">#b3ffffff</color> - <!-- 25% opacity, white. --> - <color name="button_disabled_color">#40ffffff</color> + <!-- 20% opacity, white. --> + <color name="button_disabled_color">#33ffffff</color> <!-- Background color of action bars --> - <color name="actionbar_background_color">#3B77E7</color> + <color name="actionbar_background_color">@color/dialer_theme_color</color> <color name="translucent_shadow">#33999999</color> |