commit 200cb1c38dfa88ab3593b6cd0c0f9c82f39c9bc9
author Andrew Lee <anwlee@google.com> Wed Apr 23 11:47:04 2014 -0700
committer Andrew Lee <anwlee@google.com> Wed Apr 23 11:57:52 2014 -0700
tree 66b8fa16db7ab465bc18e2f83ec28ff5003bd3e0
parent 66738d36a2605638cf83d7743d6a829d4cd02ab1

Change InCallUI colors to teal.

Also, reformatted call_button_fragment to make it cleaner.

Bug: 14108639
Change-Id: Iab86f9854a32c0dc11956b1cbd082652fac1ef4b

InCallUI/res/values/colors.xml

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index ca53f27..f667924 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -17,11 +17,15 @@
 
 <resources>
 
-    <!-- In-call UI -->
-    <color name="incall_callTypeSip">#99CE3F</color> <!-- green -->
-    <color name="incall_call_banner_background">#A0000000</color> <!-- semitransparent black -->
-    <color name="incall_secondary_info_background">#8033b5e5</color> <!-- semitransparent blueish grey -->
-    <color name="incall_call_banner_text_color">#FFFFFF</color> <!-- white -->
+    <!-- In-call UI background color. -->
+    <color name="incall_background_color">#00afcc</color>
+
+    <!-- green -->
+    <color name="incall_callTypeSip">#99CE3F</color>
+    <!-- Background color of main banner. -->
+    <color name="incall_call_banner_background_color">@color/incall_background_color</color>
+    <!-- white -->
+    <color name="incall_call_banner_text_color">#FFFFFF</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#33B5E5</color>
@@ -50,8 +54,8 @@
     <!-- Pressed color of dialpad buttons -->
     <color name="background_dialpad_pressed">#ececec</color>
 
-    <!-- Button background -->
-    <color name="button_background">#000000</color>
+    <!-- Button background color. -->
+    <color name="button_background_color">@color/incall_background_color</color>
 
     <!-- Background color of action bars -->
     <color name="actionbar_background_color">#3B77E7</color>

InCallUI/res/values/styles.xml

diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 3fb2bb2..085cdb1 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -71,7 +71,7 @@
     <style name="VerticalSeparator">
         <item name="android:layout_width">2dp</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@android:color/black</item>
+        <item name="android:background">@color/button_background_color</item>
     </style>
 
     <!-- "End" button; similar to InCallButton. -->