diff options
author | Alan Viverette <alanv@google.com> | 2014-06-11 13:07:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 13:07:56 +0000 |
commit | eca0db4b1798ba1fa839323177ae9a5ca2e2d5b9 (patch) | |
tree | 614bec7b453624c0b80f856ced058057806667ab /res | |
parent | ba165af05586de06b90b81e6619f458720d79618 (diff) | |
parent | febc9b5e5e29d3b08f13f72f05bc950e207ebb63 (diff) |
am febc9b5e: Merge "Ripple tint is now color" into lmp-preview-dev
* commit 'febc9b5e5e29d3b08f13f72f05bc950e207ebb63':
Ripple tint is now color
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/action_button_background.xml | 3 | ||||
-rw-r--r-- | res/drawable/call_log_background.xml | 3 | ||||
-rw-r--r-- | res/drawable/floating_action_button.xml | 3 | ||||
-rw-r--r-- | res/drawable/recent_lists_footer_background.xml | 3 | ||||
-rw-r--r-- | res/drawable/view_pager_tab_background.xml | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml index fd5bc6123..ea7434f24 100644 --- a/res/drawable/action_button_background.xml +++ b/res/drawable/action_button_background.xml @@ -15,8 +15,7 @@ limitations under the License. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="?android:attr/colorControlHighlight" - android:pinned="true"> + android:color="?android:attr/colorControlHighlight"> <!-- Transparent background constrains the touch feedback ripple to the button, but also allows touch feedback ripples in the parent to show under the button. --> <item> diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml index 4857fb54a..1b3dbc979 100644 --- a/res/drawable/call_log_background.xml +++ b/res/drawable/call_log_background.xml @@ -15,5 +15,4 @@ limitations under the License. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="?android:attr/colorControlHighlight" - android:pinned="false" />
\ No newline at end of file + android:color="?android:attr/colorControlHighlight" />
\ No newline at end of file diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index e4a9bb53e..d518dddd4 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -16,7 +16,6 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/dialer_accent_color" - android:pinned="true"> + android:color="@color/dialer_accent_color"> <item android:drawable="@drawable/fab_teal_background" /> </ripple> diff --git a/res/drawable/recent_lists_footer_background.xml b/res/drawable/recent_lists_footer_background.xml index 021174a16..b5029afcb 100644 --- a/res/drawable/recent_lists_footer_background.xml +++ b/res/drawable/recent_lists_footer_background.xml @@ -16,8 +16,7 @@ ~ limitations under the License --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="?android:attr/colorControlHighlight" - android:pinned="false"> + android:color="?android:attr/colorControlHighlight"> <!-- Mask to constrain the ripple to the bounds of the view. --> <item android:id="@android:id/mask"> <color android:color="@android:color/white" /> diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml index 53f891c76..1ba6c57e0 100644 --- a/res/drawable/view_pager_tab_background.xml +++ b/res/drawable/view_pager_tab_background.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/tab_ripple_color"> + android:color="@color/tab_ripple_color"> <item android:id="@android:id/mask"> <color android:color="@android:color/white" /> </item> |