summaryrefslogtreecommitdiff
path: root/InCallUI/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI/res/values')
-rw-r--r--InCallUI/res/values/colors.xml6
-rw-r--r--InCallUI/res/values/dimens.xml4
-rw-r--r--InCallUI/res/values/styles.xml9
3 files changed, 8 insertions, 11 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index e740b8428..e2eeceaea 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -24,7 +24,7 @@
<!-- 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">#99ffffff</color>
+ <color name="incall_call_banner_subtext_color">#b2ebf2</color>
<color name="incall_banner_secondary_background_color">#f5f5f5</color>
<color name="incall_banner_secondary_text_color">#808080</color>
@@ -81,6 +81,6 @@
<color name="glowpad_incoming_widget_tint">#a3a3a3</color>
<color name="glowpad_incoming_widget_background_tint">#ffffff</color>
- <!-- 15% opacity, accent color. -->
- <color name="incall_dialpad_touch_tint">#26eeff41</color>
+ <!-- 30% opacity, accent color. -->
+ <color name="incall_dialpad_touch_tint">#66eeff41</color>
</resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index cef0ee5ff..95f110118 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -20,7 +20,7 @@
<!-- Height of the "call banner" overlay on top of the upper part of
the call info area. -->
- <dimen name="call_banner_height">128dp</dimen>
+ <dimen name="call_banner_height">122dp</dimen>
<!-- Margin between the bottom of the "call card" photo
and the top of the in-call button cluster. -->
@@ -31,7 +31,7 @@
<!-- Padding at the right edges of the secondary call banner. -->
<dimen name="secondary_call_banner_right_padding">24dp</dimen>
<!-- Padding at the top and bottom edges of the "call banner". -->
- <dimen name="call_banner_primary_call_top_padding">24dp</dimen>
+ <dimen name="call_banner_primary_call_container_top_padding">16dp</dimen>
<dimen name="call_banner_secondary_call_top_bottom_padding">24dp</dimen>
<!-- Padding at the top and bottom edges of the "provider information" -->
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 7b305ec45..511bae83f 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -55,7 +55,6 @@
<item name="android:layout_width">@dimen/in_call_button_dimension</item>
<item name="android:layout_height">@dimen/in_call_button_dimension</item>
<item name="android:layout_marginBottom">@dimen/call_button_margin_vertical</item>
- <item name="android:layout_marginTop">@dimen/call_button_margin_vertical</item>
<item name="android:layout_marginLeft">@dimen/call_button_margin_horizontal</item>
<item name="android:layout_marginRight">@dimen/call_button_margin_horizontal</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
@@ -116,16 +115,14 @@
circular reveal animation for a new outgoing call to work correctly. We don't just use
Theme.Black.NoTitleBar directly, since we want any popups or dialogs
from the InCallActivity to have the correct holo style. -->
- <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo.NoActionBar">
+ <style name="Theme.InCallScreen" parent="@android:style/Theme.Quantum.Light">
<item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
- </style>
-
- <style name="PrimaryCallInfoPrimaryCallBanner">
- <item name="android:layout_alignParentTop">true</item>
+ <item name="android:textColorPrimary">@color/incall_call_banner_text_color</item>
+ <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item>
</style>
</resources>