diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-10 20:15:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 20:15:19 +0000 |
| commit | 37c68b1edbf18230243c015ddb1626e2771069c9 (patch) | |
| tree | e224a6dc32dda4bc9c56e7a67186d39e4e31d76b | |
| parent | 77fb8b6a6a55dc9410a4073e0a3b5c2ccb5eaade (diff) | |
| parent | 5e3e132c2d0ba1406ca029ef6be27fbad85e250d (diff) | |
Merge "Ripple tint is now color" into lmp-preview-dev
| -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> |