diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-19 16:36:30 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-05-19 16:36:30 -0700 |
| commit | 024a7f84fe0c605f97ffe4a176d5a8c2c17ffe7a (patch) | |
| tree | eebbd4a3264f047b6a243fb9f765ee84f067b377 /res/drawable | |
| parent | faaab2037504cd038cbae74953f9e8f401993d9d (diff) | |
TouchFeedbackDrawable is now RippleDrawable
Change-Id: I39d39333c3dea0a138357cd8c335c29710ac50d1
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/action_button_background.xml | 4 | ||||
| -rw-r--r-- | res/drawable/call_log_background.xml | 2 | ||||
| -rw-r--r-- | res/drawable/floating_action_button.xml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml index 895bda147..40b47e376 100644 --- a/res/drawable/action_button_background.xml +++ b/res/drawable/action_button_background.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" +<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:tint="?android:attr/colorButtonPressed" android:pinned="true"> <!-- Transparent background constrains the touch feedback ripple to the button, but also allows @@ -24,4 +24,4 @@ <solid android:color="@android:color/transparent" /> </shape> </item> -</touch-feedback> +</ripple> diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml index 92299f0ff..166907a22 100644 --- a/res/drawable/call_log_background.xml +++ b/res/drawable/call_log_background.xml @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" +<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:tint="?android:attr/colorButtonPressed" android:pinned="false" /> diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index ea9549054..e4a9bb53e 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -15,8 +15,8 @@ limitations under the License. --> -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" +<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:tint="@color/dialer_accent_color" android:pinned="true"> <item android:drawable="@drawable/fab_teal_background" /> -</touch-feedback> +</ripple> |