From ff1621858276c5348655f3531d15b02cb13f60eb Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 2 May 2014 13:58:18 -0700
Subject: Styling polish to InCallUI.

- Fix clipping of shadow on the end call button.
- Add translation-z to the primary call info.
- Make the dialpad in the InCallUI transparent. This required in
part renaming some constants which were being overriden by Dialer.

Bug: 14108639
Change-Id: I29657fbc9e0b9b4957135e77b2db62159541b43a
---
 InCallUI/res/values/colors.xml | 8 ++------
 InCallUI/res/values/dimens.xml | 6 +++++-
 InCallUI/res/values/styles.xml | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'InCallUI/res/values')

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 0cb767b44..fd60bbb66 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -50,11 +50,8 @@
     <!-- Color of dialpad digits -->
     <color name="dialpad_digits_text_color">#000000</color>
 
-    <!-- Background color of dialpad -->
-    <color name="background_dialpad">#ffffff</color>
-
-    <!-- Pressed color of dialpad buttons -->
-    <color name="background_dialpad_pressed">#ececec</color>
+    <color name="incall_dialpad_background">#ccffffff</color>
+    <color name="incall_dialpad_background_pressed">#33ffffff</color>
 
     <!-- Button background color. -->
     <color name="button_background_color">@color/incall_background_color</color>
@@ -65,6 +62,5 @@
     <!-- Secondary color of dialpad text (used for the letters corresponding to each digit -->
     <color name="dialpad_secondary_text_color">#8b8b8b</color>
 
-    <!-- Translucent shadow color -->
     <color name="translucent_shadow">#33999999</color>
 </resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index e9dd26bc9..ae5f5a1dd 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -56,6 +56,9 @@
     <!-- Height of buttons in the extra button row. -->
     <dimen name="extra_row_button_height">@dimen/in_call_button_height</dimen>
 
+    <dimen name="primary_call_translation_z">8dp</dimen>
+
+
     <!-- Padding at the left and right edges of the incall_touch_ui button
          cluster.  This padding is necessary because we can't allow the
          buttons to be very close to the edges of the screen, due to the
@@ -64,7 +67,6 @@
          the prox sensor kick in.) -->
     <dimen name="button_cluster_side_padding">20dp</dimen>
 
-
     <!-- Dimensions for OTA Call Card -->
     <dimen name="otaactivate_layout_marginTop">10dp</dimen>
     <dimen name="otalistenprogress_layout_marginTop">5dp</dimen>
@@ -135,4 +137,6 @@
 
     <!-- Height of translucent shadow effect -->
     <dimen name="translucent_shadow_height">2dp</dimen>
+
+    <dimen name="end_call_button_margin_bottom">15dp</dimen>
 </resources>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index ce93c628d..b0f25ec51 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -161,7 +161,7 @@
         <item name="android:clickable">true</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/dialpad_key_height</item>
-        <item name="android:background">@drawable/dialpad_key_colors</item>
+        <item name="android:background">@drawable/incall_dialpad_key_colors</item>
         <item name="android:focusable">true</item>
     </style>
 
-- 
cgit v1.2.3