Touch up InCallUI call card positioning.

- Position the sizes, layout, and transitions of text better.
- Correct the sizing of the buttons.

Bug: 14622411, 14617751, 14618551
Change-Id: Idbc5f9b97447d6b40e4702ea70db2196dfdab979

2 files changed, 13 insertions, 12 deletions

diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 64a40d9b3..c6b819d4c 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -31,30 +31,29 @@
     <!-- Padding at the right edges of the secondary call banner. -->
     <dimen name="secondary_call_banner_right_padding">100dp</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_top_padding">16dp</dimen>
     <dimen name="call_banner_top_bottom_padding">8dp</dimen>
 
     <!-- Padding at the top and bottom edges of the "provider information" -->
     <dimen name="provider_info_top_bottom_padding">8dp</dimen>
 
     <!-- Text size for the name in the call info. -->
+    <dimen name="call_status_text_size">22sp</dimen>
     <dimen name="call_name_text_size">36sp</dimen>
-    <!-- Text size for the call info label and number. -->
     <dimen name="call_label_text_size">18sp</dimen>
-
     <!-- Right padding for name and number fields in the call banner.
          This padding is used to ensure that ultra-long names or
          numbers won't overlap the elapsed time indication. -->
     <dimen name="call_banner_name_number_right_padding">50sp</dimen>
 
-    <!-- Height of the main row of in-call buttons. -->
-    <dimen name="in_call_button_height">48dp</dimen>
+    <!-- Height and width of the in-call buttons. -->
+    <dimen name="in_call_button_dimension">48dp</dimen>
 
     <!-- Width of buttons in the extra button row. -->
     <dimen name="extra_row_button_width">56dp</dimen>
 
     <!-- Height of buttons in the extra button row. -->
-    <dimen name="extra_row_button_height">@dimen/in_call_button_height</dimen>
+    <dimen name="extra_row_button_height">@dimen/in_call_button_dimension</dimen>
 
     <dimen name="primary_call_translation_z">8dp</dimen>
 
@@ -66,8 +65,8 @@
          holding the phone, *before* moving it up to your face and having
          the prox sensor kick in.) -->
     <dimen name="button_cluster_horizontal_padding">20dp</dimen>
-    <dimen name="button_cluster_vertical_padding">4dp</dimen>
-    <dimen name="call_button_margin">4dp</dimen>
+    <dimen name="call_button_margin_vertical">4dp</dimen>
+    <dimen name="call_button_margin_horizontal">2dp</dimen>
 
     <!-- Dimensions for OTA Call Card -->
     <dimen name="otaactivate_layout_marginTop">10dp</dimen>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index f77cb24df..c5b5d4722 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -52,10 +52,12 @@
 
     <!-- Buttons in the main "button row" of the in-call onscreen touch UI. -->
     <style name="InCallButton">
-        <item name="android:layout_width">0px</item>
-        <item name="android:layout_height">@dimen/in_call_button_height</item>
-        <item name="android:layout_margin">@dimen/call_button_margin</item>
-        <item name="android:layout_weight">1</item>
+        <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_marginTop">@dimen/call_button_margin_vertical</item>
+        <item name="android:layout_marginBottom">@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>
     </style>