From 3a7108ae5fc630730457957629b1115dcc991454 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Mon, 25 Aug 2014 12:19:35 -0700
Subject: 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
---
 InCallUI/res/values/dimens.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'InCallUI/res/values/dimens.xml')

diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 8648c8c13..55f0c3e13 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -21,6 +21,7 @@
     <!-- Height of the "call banner" overlay on top of the upper part of
          the call info area. -->
     <dimen name="call_banner_height">122dp</dimen>
+    <dimen name="incall_action_bar_elevation">3dp</dimen>
 
     <!-- Margin between the bottom of the "call card" photo
          and the top of the in-call button cluster. -->
@@ -50,8 +51,9 @@
     <!-- Height and width of the in-call buttons. -->
     <dimen name="in_call_button_dimension">48dp</dimen>
 
-    <dimen name="primary_call_elevation">4dp</dimen>
-    <dimen name="secondary_call_elevation">4dp</dimen>
+    <dimen name="primary_call_elevation">5dp</dimen>
+    <dimen name="dialpad_elevation">2dp</dimen>
+    <dimen name="secondary_call_elevation">1dp</dimen>
 
     <dimen name="floating_action_bar_vertical_offset">-24dp</dimen>
 
@@ -109,4 +111,6 @@
     <dimen name="end_call_floating_action_button_diameter">72dp</dimen>
     <dimen name="end_call_floating_action_button_small_diameter">56dp</dimen>
 
+    <dimen name="conference_call_manager_padding_top">64dp</dimen>
+    <dimen name="conference_call_manager_button_dimension">46dp</dimen>
 </resources>
-- 
cgit v1.2.3