Adjust conference call/hold appearances.

+ Increase height to 56dp.
- Remove elevation shadow.
+ Change text/cion colors to #333333.
+ Add white line at the top of the containers.
+ Move "on hold" text 8dp to the right.

Bug: 17422046
Change-Id: I66ced4a1d40f9ba04dffdee7fb7945a26c7fede1

3 files changed, 23 insertions, 18 deletions

diff --git a/res/layout/call_card_content.xml b/res/layout/call_card_content.xml
index 8b3aaeff..4f1b6f17 100644
--- a/res/layout/call_card_content.xml
+++ b/res/layout/call_card_content.xml
@@ -102,8 +102,7 @@
     <include layout="@layout/manage_conference_call_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/photo"
-        android:elevation="@dimen/secondary_call_elevation" />
+        android:layout_alignTop="@id/photo" />
 
     <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
     <FrameLayout
diff --git a/res/layout/manage_conference_call_button.xml b/res/layout/manage_conference_call_button.xml
index 13d8fca5..e9de926f 100644
--- a/res/layout/manage_conference_call_button.xml
+++ b/res/layout/manage_conference_call_button.xml
@@ -22,15 +22,19 @@
     android:layout_height="wrap_content"
     android:background="@color/incall_banner_secondary_background_color">
 
+    <Space android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/secondary_call_info_divider_highlight_color" />
+
     <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a
          background color and ripple to the button. -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/call_banner_side_padding"
-        android:paddingEnd="@dimen/secondary_call_banner_right_padding"
-        android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
-        android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
+        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"
+        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"
+        android:paddingTop="@dimen/secondary_call_info_vertical_padding"
+        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"
         android:background="?android:attr/selectableItemBackground">
 
         <ImageView android:id="@+id/manageConferenceButtonImage"
@@ -45,8 +49,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/incall_banner_secondary_text_color"
+            android:textSize="@dimen/secondary_call_info_text_size"
             android:text="@string/onscreenManageConferenceText" />
 
     </LinearLayout>
diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
index 46d7316c..772a29bc 100644
--- a/res/layout/secondary_call_info.xml
+++ b/res/layout/secondary_call_info.xml
@@ -21,8 +21,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="@color/incall_banner_secondary_background_color"
-    android:elevation="@dimen/secondary_call_elevation">
+    android:background="@color/incall_banner_secondary_background_color">
+
+    <Space android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/secondary_call_info_divider_highlight_color" />
 
     <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a
          background color and ripple to the button. -->
@@ -30,10 +33,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/call_banner_side_padding"
-        android:paddingEnd="@dimen/secondary_call_banner_right_padding"
-        android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
-        android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
+        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"
+        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"
+        android:paddingTop="@dimen/secondary_call_info_vertical_padding"
+        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"
         android:background="?android:attr/selectableItemBackground">
 
         <ImageView android:id="@+id/secondaryCallConferenceCallIcon"
@@ -53,8 +56,8 @@
             <TextView android:id="@+id/secondaryCallName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/incall_banner_secondary_text_color"
+                android:textSize="@dimen/secondary_call_info_text_size"
                 android:ellipsize="marquee"
                 android:singleLine="true"/>
 
@@ -75,9 +78,8 @@
                 <TextView android:id="@+id/secondaryCallProviderLabel"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/onHold"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@color/incall_banner_secondary_text_color"
+                    android:textSize="@dimen/secondary_call_info_text_size"
                     android:singleLine="true"/>
 
             </LinearLayout>
@@ -89,10 +91,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingEnd="@dimen/call_banner_side_padding"
+            android:paddingEnd="18dp"
             android:text="@string/onHold"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/incall_banner_secondary_text_color"
+            android:textSize="@dimen/secondary_call_info_text_size"
             android:textAlignment="textEnd"
             android:singleLine="true" />