diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-09 17:47:05 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-06-10 00:59:22 +0000 |
| commit | 5e3e132c2d0ba1406ca029ef6be27fbad85e250d (patch) | |
| tree | f6995ba3bbb0c3ed002817f8b67240ccfd68ac5e /InCallUI/res/drawable | |
| parent | 64fb20f5364ab69f64abf5d7f5b03f32f85b5f75 (diff) | |
Ripple tint is now color
Change-Id: I3570aa6cf824942c72a5c78d41566231a24b76f9
Diffstat (limited to 'InCallUI/res/drawable')
| -rw-r--r-- | InCallUI/res/drawable/btn_background.xml | 3 | ||||
| -rw-r--r-- | InCallUI/res/drawable/btn_compound_background.xml | 3 | ||||
| -rw-r--r-- | InCallUI/res/drawable/end_call_background.xml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml index 6a5592fbe..597885803 100644 --- a/InCallUI/res/drawable/btn_background.xml +++ b/InCallUI/res/drawable/btn_background.xml @@ -19,8 +19,7 @@ These buttons have two states (checked and unchecked), and show a blue bar along the bottom edge when checked. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/incall_accent_color" - android:pinned="true"> + android:color="@color/incall_accent_color"> <item> <selector> diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml index fbca031dc..93e6c311a 100644 --- a/InCallUI/res/drawable/btn_compound_background.xml +++ b/InCallUI/res/drawable/btn_compound_background.xml @@ -17,8 +17,7 @@ <!-- Background resource for "compound buttons" in the in-call UI. These buttons have two states (selected and unselected). --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/incall_accent_color" - android:pinned="true"> + android:color="@color/incall_accent_color"> <item> <selector> <item android:state_selected="true" android:state_focused="true" diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml index 282285be6..db1bd7365 100644 --- a/InCallUI/res/drawable/end_call_background.xml +++ b/InCallUI/res/drawable/end_call_background.xml @@ -16,7 +16,6 @@ <!-- Background drawable used to render the "end call" button. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/end_call_touch_feedback_tint" - android:pinned="true"> + android:color="@color/end_call_touch_feedback_tint"> <item android:drawable="@drawable/fab_red_background" /> </ripple> |