resolved conflicts for merge of 121e8dc0 to master-nova

Change-Id: I8cfd2d26ddd4ea96e76758e4e3485a10fcaedd50

3 files changed, 6 insertions, 13 deletions

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index ac718e215..420ba4b11 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -37,13 +37,13 @@
     <color name="manage_conference_secondary_text_color">#888888</color>
 
     <!-- Used when the End Call button is active -->
-    <drawable name="end_call_active_state">#f22121</drawable>
+    <color name="end_call_active_color">#f22121</color>
 
     <!-- Used when the End Call button is pressed -->
-    <drawable name="end_call_pressed_state">#ff4e4e</drawable>
+    <color name="end_call_pressed_color">#ff4e4e</color>
 
     <!-- Used when the End Call button is disabled -->
-    <drawable name="end_call_disabled_state">#303030</drawable>
+    <color name="end_call_disabled_color">#303030</color>
 
     <!-- Color of dialpad digits -->
     <color name="dialpad_digits_text_color">#000000</color>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 92e55d60c..ec0009e4f 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -44,15 +44,15 @@
     <!-- Height of the main row of in-call buttons. -->
     <dimen name="in_call_button_height">76dp</dimen>
 
-    <!-- Height of the in-call "End" button. Match with Contact's dimens/call_button_height -->
-    <dimen name="in_call_end_button_height">60dp</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>
 
+    <!-- Bottom margin for the end call button. -->
+    <dimen name="end_call_button_margin_bottom">30dp</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
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 085cdb189..7b47d6703 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -74,13 +74,6 @@
         <item name="android:background">@color/button_background_color</item>
     </style>
 
-    <!-- "End" button; similar to InCallButton. -->
-    <style name="InCallEndButton">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">@dimen/in_call_end_button_height</item>
-        <item name="android:layout_weight">1</item>
-    </style>
-
     <!-- Buttons in extra button row. -->
     <style name="InCallExtraRowButton">
         <item name="android:layout_width">@dimen/extra_row_button_width</item>