From f89a6ff0918c5af0703f68401db48f9709948463 Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Thu, 1 May 2014 09:15:28 -0700
Subject: Fix the build

Somewhere along the line, we dropped a resource (and a variable name
was changed). Fix these errors.

Change-Id: I06ce956961e8bf0e08f03d51651bf48262055703
---
 InCallUI/res/values/dimens.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'InCallUI/res/values')

diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 0ecfab45f..e9dd26bc9 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -37,6 +37,11 @@
     <!-- 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_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. -->
-- 
cgit v1.2.3


From 09bbf1595013b3d871230c368d26d577f60a0b8a Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Fri, 9 May 2014 13:23:34 -0700
Subject: Re-add network indicator/handoff button

Add a handoff button (and network indicator) back into InCallUI. This
has not be vetted by UX or anything, but it will hopefully not cause
merge conflicts.

Change-Id: I6d0a8e7cd865df70b13fc69ec96cdc98e0e3f203
---
 InCallUI/res/values/colors.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'InCallUI/res/values')

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 0cdf93a01..6837a268d 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -47,6 +47,18 @@
     <!-- Used when the End Call button is disabled -->
     <color name="end_call_disabled_color">#303030</color>
 
+    <!-- Used when the Handoff Call button is active -->
+    <color name="handoff_call_active_color">#F2882C</color>
+
+    <!-- Used when the Handoff Call button is pressed -->
+    <color name="handoff_call_pressed_color">#F2A35E</color>
+
+    <!-- Used when the Handoff Call button is disabled -->
+    <color name="handoff_call_disabled_color">#303030</color>
+
+    <color name="call_state_wifi">#19E392</color>
+    <color name="call_state_cellular">#33A9F2</color>
+
     <!-- Color of dialpad digits -->
     <color name="dialpad_digits_text_color">#000000</color>
 
-- 
cgit v1.2.3