resolved conflicts for merge of 41ffd656 to master-nova

Change-Id: Ie8f34527c54b99e4e6530ff9ccf2bfb24f222487

7 files changed, 18 insertions, 133 deletions

diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml
index 24b437482..4477d9e30 100644
--- a/InCallUI/res/drawable/end_call_background.xml
+++ b/InCallUI/res/drawable/end_call_background.xml
@@ -15,8 +15,8 @@
 -->
 
 <!-- Background drawable used to render the "end call" button. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@color/end_call_disabled_color" />
-    <item android:state_pressed="true" android:drawable="@color/end_call_pressed_color" />
-    <item android:drawable="@color/end_call_active_color" />
-</selector>
+<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="@color/end_call_touch_feedback_tint"
+    android:pinned="true">
+    <item android:drawable="@drawable/fab_red_background" />
+</touch-feedback>
diff --git a/InCallUI/res/drawable/floating_end_button_active_background.xml b/InCallUI/res/drawable/floating_end_button_active_background.xml
deleted file mode 100644
index 935c93721..000000000
--- a/InCallUI/res/drawable/floating_end_button_active_background.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-    <corners
-        android:radius="@dimen/floating_action_button_radius" />
-    <size
-        android:width="@dimen/floating_action_button_width"
-        android:height="@dimen/floating_action_button_height" />
-    <solid
-        android:color="@color/end_call_active_color" />
-</shape>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/floating_end_button_compound_background.xml b/InCallUI/res/drawable/floating_end_button_compound_background.xml
deleted file mode 100644
index 433545b84..000000000
--- a/InCallUI/res/drawable/floating_end_button_compound_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Background drawable used to render the floating circular "end call" button. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/floating_end_button_disabled_background" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/floating_end_button_pressed_background" />
-    <item android:drawable="@drawable/fab_red_background" />
-</selector>
diff --git a/InCallUI/res/drawable/floating_end_button_disabled_background.xml b/InCallUI/res/drawable/floating_end_button_disabled_background.xml
deleted file mode 100644
index 3772b00b0..000000000
--- a/InCallUI/res/drawable/floating_end_button_disabled_background.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-    <corners
-        android:radius="@dimen/floating_action_button_radius" />
-    <size
-        android:width="@dimen/floating_action_button_width"
-        android:height="@dimen/floating_action_button_height" />
-    <solid
-        android:color="@color/end_call_disabled_color" />
-</shape>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/floating_end_button_pressed_background.xml b/InCallUI/res/drawable/floating_end_button_pressed_background.xml
deleted file mode 100644
index cd58a84e7..000000000
--- a/InCallUI/res/drawable/floating_end_button_pressed_background.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-    <corners
-        android:radius="@dimen/floating_action_button_radius" />
-    <size
-        android:width="@dimen/floating_action_button_width"
-        android:height="@dimen/floating_action_button_height" />
-    <solid
-        android:color="@color/end_call_pressed_color" />
-</shape>
\ No newline at end of file
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 8b54ad6b9..2dbce1c85 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -96,12 +96,12 @@
                 android:layout_gravity="bottom|center">
 
             <ImageButton android:id="@+id/endButton"
-                         android:layout_width="@dimen/floating_action_button_width"
-                         android:layout_height="@dimen/floating_action_button_height"
-                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
-                         android:background="@drawable/floating_end_button_compound_background"
-                         android:src="@drawable/ic_in_call_phone_hangup"
-                         android:contentDescription="@string/onscreenEndCallText" />
+		 android:layout_width="@dimen/floating_action_button_width"
+		 android:layout_height="@dimen/floating_action_button_height"
+		 android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+		 android:background="@drawable/end_call_background"
+		 android:src="@drawable/ic_in_call_phone_hangup"
+		 android:contentDescription="@string/onscreenEndCallText" />
 
         </FrameLayout>
 
@@ -112,12 +112,12 @@
                 android:layout_gravity="bottom|right">
 
             <ImageButton android:id="@+id/handoffButton"
-                         android:enabled="false"
-                         android:layout_width="@dimen/floating_action_button_width"
-                         android:layout_height="@dimen/floating_action_button_height"
-                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
-                         android:background="@drawable/floating_handoff_button_compound_background"
-                         android:src="@drawable/ic_in_call_pstn" />
+		 android:enabled="false"
+		 android:layout_width="@dimen/floating_action_button_width"
+		 android:layout_height="@dimen/floating_action_button_height"
+		 android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+		 android:background="@drawable/floating_handoff_button_compound_background"
+		 android:src="@drawable/ic_in_call_pstn" />
 
         </FrameLayout>
 
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 81aa01451..62d35f8f0 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -37,14 +37,7 @@
     <!-- Used with some smaller texts in manage conference screen. -->
     <color name="manage_conference_secondary_text_color">#888888</color>
 
-    <!-- Used when the End Call button is active -->
-    <color name="end_call_active_color">#f22121</color>
-
-    <!-- Used when the End Call button is pressed -->
-    <color name="end_call_pressed_color">#ff4e4e</color>
-
-    <!-- Used when the End Call button is disabled -->
-    <color name="end_call_disabled_color">#303030</color>
+    <color name="end_call_touch_feedback_tint">#dddddd</color>
 
     <!-- Used when the Handoff Call button is active -->
     <color name="handoff_call_active_color">#F2882C</color>