summaryrefslogtreecommitdiff
path: root/InCallUI/res/values/styles.xml
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-08-25 12:19:35 -0700
committerAndrew Lee <anwlee@google.com>2014-08-27 10:41:09 -0700
commit3a7108ae5fc630730457957629b1115dcc991454 (patch)
tree3d3ec5b7f9b6adc8608d5dbf0e00dc393e1cccc7 /InCallUI/res/values/styles.xml
parent677b93933325b6ba617a765faffe76519504daeb (diff)
Restyle conference call manager screen.
+ Swap out/in new assets for end/split icons in the manager screen, and the splash screen in the InCall screen. - Removed unused conference call manager code, including things like chronometer and the "done" button. + Replaced custom action bar in conferece call manager with standard action bar. + Added contact image (does not open quick contact) in the list of calls in the conference call manager. This is done with a lookup using the contact photo manager, and required adding the lookup key to the ContactCacheEntry. + Handled a missing Call.State case in CallCardFragment for calls with state CONFERENCED which caused crashes. + Misc style changes on conference call manager: colors, sizes, paddings. + Adjusted elevations so dialpad covers manager/secondary buttons. + Added ripple to manager/secondary buttons. Bug: 15862303 Change-Id: Iab9b6421d5a1ea69cd951a459d46c065f9456a8f
Diffstat (limited to 'InCallUI/res/values/styles.xml')
-rw-r--r--InCallUI/res/values/styles.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index f49cee910..17edfafc5 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -92,21 +92,27 @@
<!-- Theme for the InCallActivity activity. Should have a transparent background for the
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. -->
+ Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
+ InCallActivity to have the correct Material style. -->
<style name="Theme.InCallScreen" parent="@android:style/Theme.Material.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>
<item name="android:textColorPrimary">@color/incall_call_banner_text_color</item>
<item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
<item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item>
+ <item name="android:actionBarStyle">@style/InCallActionBarStyle</item>
</style>
<style name="InCallPopupMenuStyle" parent="@android:style/Theme.Material.Light">
<item name="android:textColorPrimary">@color/popup_menu_color</item>
</style>
+
+ <style name="InCallActionBarStyle" parent="@android:style/Widget.Material.Light.ActionBar">
+ <item name="android:background">@color/incall_action_bar_background_color</item>
+ <item name="android:textColor">@color/incall_action_bar_text_color</item>
+ </style>
+
</resources>