From c5ff890f0a3deea02ac27a0b7574e7c112160b5b Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 19 May 2014 16:32:43 -0700
Subject: TouchFeedbackDrawable is now RippleDrawable

Change-Id: I6d92fe9a58ee30e42639b5f427678170997ac039
---
 InCallUI/res/drawable/btn_background.xml          | 4 ++--
 InCallUI/res/drawable/btn_compound_background.xml | 4 ++--
 InCallUI/res/drawable/end_call_background.xml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml
index 9a6c2f0cc..6a5592fbe 100644
--- a/InCallUI/res/drawable/btn_background.xml
+++ b/InCallUI/res/drawable/btn_background.xml
@@ -18,7 +18,7 @@
 <!-- Background resource for "compound buttons" in the in-call UI.
      These buttons have two states (checked and unchecked), and
      show a blue bar along the bottom edge when checked. -->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/incall_accent_color"
     android:pinned="true">
     <item>
@@ -31,4 +31,4 @@
 
         </selector>
     </item>
-</touch-feedback>
+</ripple>
diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml
index 7beffa59f..fbca031dc 100644
--- a/InCallUI/res/drawable/btn_compound_background.xml
+++ b/InCallUI/res/drawable/btn_compound_background.xml
@@ -16,7 +16,7 @@
 
 <!-- Background resource for "compound buttons" in the in-call UI.
      These buttons have two states (selected and unselected). -->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/incall_accent_color"
     android:pinned="true">
     <item>
@@ -33,4 +33,4 @@
             <item android:drawable="@drawable/btn_unselected" />
         </selector>
     </item>
-</touch-feedback>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml
index 4477d9e30..282285be6 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. -->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple 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>
+</ripple>
-- 
cgit v1.2.3