am 332b21f5: Adjust conference call/hold appearances.

* commit '332b21f59a5aba79b504a35bdd6ddd8207260ff7':
  Adjust conference call/hold appearances.

5 files changed, 28 insertions, 23 deletions

diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index 8b3aaeffe..4f1b6f17c 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/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/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml
index 13d8fca58..e9de926fd 100644
--- a/InCallUI/res/layout/manage_conference_call_button.xml
+++ b/InCallUI/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/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 46d7316c1..772a29bc1 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/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" />
 
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index e2aac3a72..f691fe2d0 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -27,7 +27,7 @@
     <!-- 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>
+    <color name="incall_banner_secondary_text_color">#333333</color>
 
     <color name="incall_action_bar_background_color">@color/incall_background_color</color>
     <color name="incall_action_bar_text_color">@color/incall_call_banner_text_color</color>
@@ -40,6 +40,7 @@
     <color name="conference_call_manager_icon_color">#999999</color>
     <!-- Used with some smaller texts in manage conference screen. -->
     <color name="conference_call_manager_secondary_text_color">#999999</color>
+    <color name="secondary_call_info_divider_highlight_color">#ffffff</color>
 
     <color name="end_call_touch_feedback_tint">#dddddd</color>
 
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 55f0c3e13..ee8ecefe1 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -29,11 +29,11 @@
 
     <!-- Padding at the left and right edges of the "call banner". -->
     <dimen name="call_banner_side_padding">24dp</dimen>
-    <!-- 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_container_top_padding">16dp</dimen>
-    <dimen name="call_banner_secondary_call_top_bottom_padding">24dp</dimen>
+    <dimen name="secondary_call_info_horizontal_padding">24dp</dimen>
+    <dimen name="secondary_call_info_vertical_padding">32dp</dimen>
+    <dimen name="secondary_call_info_text_size">16sp</dimen>
 
     <!-- Padding at the top and bottom edges of the "provider information" -->
     <dimen name="provider_info_top_bottom_padding">8dp</dimen>
@@ -53,7 +53,6 @@
 
     <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>