Change InCallUI colors to teal.

Also, reformatted call_button_fragment to make it cleaner.

Bug: 14108639
Change-Id: Iab86f9854a32c0dc11956b1cbd082652fac1ef4b

6 files changed, 68 insertions, 72 deletions

diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 13573ea78..cd58d9a25 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -30,15 +30,15 @@
 
 <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/bottomButtons"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:background="#0000ff"
-              android:layout_margin="0dp"
-              android:padding="0dp"
-              android:layout_height="wrap_content"
-              android:layout_alignParentBottom="true"
-              android:visibility="invisible">
+        android:id="@+id/bottomButtons"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:background="#0000ff"
+        android:layout_margin="0dp"
+        android:padding="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="invisible" >
 
     <!-- Row 1, the "extra button row": A couple of relatively rare
          buttons used only in certain call states.
@@ -46,17 +46,17 @@
          For now, at least, there's only ever one button visible here
          at a time, so this can be a simple FrameLayout. -->
     <include android:id="@+id/extraButtonRow"
-          layout="@layout/extra_button_row"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+            layout="@layout/extra_button_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
     <!-- Row 2: The "End call" button. -->
     <ImageButton android:id="@+id/endButton"
-                 style="@style/InCallEndButton"
-                 android:layout_width="match_parent"
-                 android:src="@drawable/ic_in_call_phone_hangup"
-                 android:background="@drawable/end_call_background"
-                 android:contentDescription="@string/onscreenEndCallText"/>
+            style="@style/InCallEndButton"
+            android:layout_width="match_parent"
+            android:src="@drawable/ic_in_call_phone_hangup"
+            android:background="@drawable/end_call_background"
+            android:contentDescription="@string/onscreenEndCallText" />
 
     <!-- Row 3: The main batch of in-call buttons:
          Dialpad / Audio mode / Mute / Hold / Add call
@@ -68,8 +68,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/button_cluster_side_padding"
             android:paddingEnd="@dimen/button_cluster_side_padding"
-            android:background="@color/button_background"
-            >
+            android:background="@color/button_background_color" >
 
         <!-- This row has either 4 or 5 buttons, depending on
        whether the device supports "Hold" (i.e. 4 buttons on
@@ -89,13 +88,12 @@
         <!-- "Dialpad" -->
         <!-- This is a "compound button": it has checked and unchecked states. -->
         <ToggleButton android:id="@+id/dialpadButton"
-                      style="@style/InCallCompoundButton"
-                      android:background="@drawable/btn_compound_dialpad"
-                      android:contentDescription="@string/onscreenShowDialpadText"
-                />
+                style="@style/InCallCompoundButton"
+                android:background="@drawable/btn_compound_dialpad"
+                android:contentDescription="@string/onscreenShowDialpadText" />
 
         <!-- Separator between 1st and 2nd button -->
-        <View style="@style/VerticalSeparator"/>
+        <View style="@style/VerticalSeparator" />
 
         <!-- "Audio mode" -->
         <!-- This is a multi-mode button that can behave either like a
@@ -104,10 +102,9 @@
              btn_compound_audio.xml and InCallTouchUi.updateAudioButton()
              for the full details. -->
         <ImageButton android:id="@+id/audioButton"
-                      style="@style/InCallButton"
-                      android:background="@drawable/btn_compound_audio"
-                      android:contentDescription="@string/onscreenAudioText"
-                />
+                style="@style/InCallButton"
+                android:background="@drawable/btn_compound_audio"
+                android:contentDescription="@string/onscreenAudioText" />
 
         <!-- Separator between 2nd and 3rd button -->
         <View style="@style/VerticalSeparator"/>
@@ -115,13 +112,12 @@
         <!-- "Mute" -->
         <!-- This is a "compound button": it has checked and unchecked states. -->
         <ImageButton android:id="@+id/muteButton"
-                      style="@style/InCallButton"
-                      android:background="@drawable/btn_fake_compound_mute"
-                      android:contentDescription="@string/onscreenMuteText"
-                />
+                style="@style/InCallButton"
+                android:background="@drawable/btn_fake_compound_mute"
+                android:contentDescription="@string/onscreenMuteText" />
 
         <!-- Separator between 3rd and 4th button -->
-        <View style="@style/VerticalSeparator"/>
+        <View style="@style/VerticalSeparator" />
 
         <!-- This slot is either "Hold" or "Swap", depending on
              the state of the call.   One or the other of these
@@ -129,56 +125,52 @@
         <!-- "Hold" -->
         <!-- This is a "compound button": it has checked and unchecked states. -->
         <ImageButton android:id="@+id/holdButton"
-                      style="@style/InCallButton"
-                      android:background="@drawable/btn_fake_compound_hold"
-                      android:contentDescription="@string/onscreenHoldText"
-                />
+                style="@style/InCallButton"
+                android:background="@drawable/btn_fake_compound_hold"
+                android:contentDescription="@string/onscreenHoldText" />
+
         <!-- "Swap" (or "Manage calls" in some CDMA states) -->
         <ImageButton android:id="@+id/swapButton"
-                     style="@style/InCallButton"
-                     android:src="@drawable/ic_incall_switch_holo_dark"
-                     android:contentDescription="@string/onscreenSwapCallsText"
-                     android:visibility="gone"
-                />
+                style="@style/InCallButton"
+                android:src="@drawable/ic_incall_switch_holo_dark"
+                android:contentDescription="@string/onscreenSwapCallsText"
+                android:visibility="gone" />
 
         <!-- Separator between 4th and 5th button (if 5th exists) -->
         <View android:id="@+id/holdSwapSpacer"
-              style="@style/VerticalSeparator"/>
+                style="@style/VerticalSeparator"/>
 
         <!-- This slot is either "Add" or "Merge", depending on
              the state of the call.  One or the other of these
              must always be set to GONE. -->
         <!-- "Add Call" -->
         <ImageButton android:id="@+id/addButton"
-                     style="@style/InCallButton"
-                     android:src="@drawable/ic_add_contact_holo_dark"
-                     android:contentDescription="@string/onscreenAddCallText"
-                     android:visibility="gone"
-                />
+                style="@style/InCallButton"
+                android:src="@drawable/ic_add_contact_holo_dark"
+                android:contentDescription="@string/onscreenAddCallText"
+                android:visibility="gone" />
+
         <!-- "Merge calls" -->
         <!-- This button is used only on GSM devices, where we know
              that "Add" and "Merge" are never available at the same time.
              The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
         <ImageButton android:id="@+id/mergeButton"
-                     style="@style/InCallButton"
-                     android:src="@drawable/ic_merge_holo_dark"
-                     android:contentDescription="@string/onscreenMergeCallsText"
-                     android:visibility="gone"
-                />
+                style="@style/InCallButton"
+                android:src="@drawable/ic_merge_holo_dark"
+                android:contentDescription="@string/onscreenMergeCallsText"
+                android:visibility="gone" />
 
         <!-- Separator between 5th and 6th button -->
         <View android:id="@+id/auxiliaryActionSpacer"
-              style="@style/VerticalSeparator"
-              android:visibility="gone"
-                />
+                style="@style/VerticalSeparator"
+                android:visibility="gone" />
 
         <ImageButton android:id="@+id/auxiliaryActionButton"
-                     style="@style/InCallButton"
-                     android:visibility="gone"
-                />
+                style="@style/InCallButton"
+                android:visibility="gone" />
 
         <!-- Separator between last button and right padding -->
-        <View style="@style/VerticalSeparator"/>
+        <View style="@style/VerticalSeparator" />
 
     </LinearLayout>
 
diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml
index ade3e4e1d..35dcf0713 100644
--- a/InCallUI/res/layout/extra_button_row.xml
+++ b/InCallUI/res/layout/extra_button_row.xml
@@ -18,7 +18,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/button_background">
+    android:background="@color/button_background_color">
     <!-- The buttons here have a text label floating off to the side
          (which is necessary because these buttons are used only in
          a few rare states, and the meaning of the icon might not be
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index d013f7022..fd2fe50ef 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -51,7 +51,7 @@
             android:paddingEnd="@dimen/call_banner_side_padding"
             android:paddingTop="@dimen/call_banner_top_bottom_padding"
             android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-            android:background="@color/incall_call_banner_background">
+            android:background="@color/incall_call_banner_background_color">
 
             <!-- Name (or the phone number, if we don't have a name to display). -->
             <TextView android:id="@+id/name"
@@ -120,7 +120,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:orientation="vertical"
-            android:background="@color/incall_secondary_info_background"
+            android:background="@color/incall_call_banner_background_color"
             android:animateLayoutChanges="true">
 
             <!-- The "call state label": In some states, this shows a special
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 787dc59b0..6f0fee5c1 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -46,7 +46,7 @@
         android:paddingEnd="@dimen/secondary_call_banner_right_padding"
         android:paddingTop="@dimen/call_banner_top_bottom_padding"
         android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-        android:background="@color/incall_call_banner_background">
+        android:background="@color/incall_call_banner_background_color">
         <!-- Name (or the phone number, if we don't have a name to display). -->
         <TextView android:id="@+id/secondaryCallName"
             style="@style/SecondaryCallInfoSecondaryCallName"
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index ca53f272e..f6679249c 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>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 3fb2bb28a..085cdb189 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. -->