am 005ab1f8: Merge "Adding missing touch feedback ripples for swap and hold conference buttons." into lmp-mr1-dev

* commit '005ab1f8cf6dc3c1a42edf209725b1d1f9a5712e':
  Adding missing touch feedback ripples for swap and hold conference buttons.

3 files changed, 32 insertions, 2 deletions

diff --git a/InCallUI/res/drawable/conference_ripple.xml b/InCallUI/res/drawable/conference_ripple.xml
new file mode 100644
index 000000000..4e4a21304
--- /dev/null
+++ b/InCallUI/res/drawable/conference_ripple.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/ripple_light">
+    <!-- Constrain the ripple to a rectangular area -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/background_dialer_white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/InCallUI/res/layout/caller_in_conference.xml b/InCallUI/res/layout/caller_in_conference.xml
index 0d15eb10f..ac78096f6 100644
--- a/InCallUI/res/layout/caller_in_conference.xml
+++ b/InCallUI/res/layout/caller_in_conference.xml
@@ -97,7 +97,8 @@
         android:scaleType="center"
         android:contentDescription="@string/goPrivate"
         android:tint="@color/conference_call_manager_icon_color"
-        android:background="?android:attr/selectableItemBackgroundBorderless" />
+        android:background="@drawable/conference_ripple"
+        android:clickable="true" />
 
     <!-- "Disconnect" button which terminates the connection with this caller. -->
     <ImageButton
@@ -109,6 +110,7 @@
         android:scaleType="center"
         android:contentDescription="@string/onscreenEndCallText"
         android:tint="@color/conference_call_manager_icon_color"
-        android:background="?android:attr/selectableItemBackgroundBorderless" />
+        android:background="@drawable/conference_ripple"
+        android:clickable="true" />
 
 </LinearLayout>  <!-- End of single list element -->
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 0308c9b76..afc557bc1 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -103,4 +103,7 @@
         <item>#AD1457</item>
         <item>#B93221</item>
     </array>
+
+    <!-- Ripple color used over light backgrounds. -->
+    <color name="ripple_light">#40000000</color>
 </resources>