diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-05 19:01:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-05 19:01:56 +0000 |
| commit | 04fef7140a8bb48d7ba7e9172a8dc636d0a7a121 (patch) | |
| tree | 1226e3b2d18bc3f46a88dba96d46e87268920a56 /res | |
| parent | a7a7ec2ca96a722f934b2112bb8df71643231bb4 (diff) | |
| parent | 55bd1516517e4ab2f442c70dedbe1681c31f9a69 (diff) | |
Merge "Re-enable ripples for viewpager tabs and recents footer" into lmp-preview-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/recent_lists_footer_background.xml | 4 | ||||
| -rw-r--r-- | res/drawable/view_pager_tab_background.xml | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/res/drawable/recent_lists_footer_background.xml b/res/drawable/recent_lists_footer_background.xml index 566e353b2..021174a16 100644 --- a/res/drawable/recent_lists_footer_background.xml +++ b/res/drawable/recent_lists_footer_background.xml @@ -19,5 +19,7 @@ android:tint="?android:attr/colorControlHighlight" android:pinned="false"> <!-- Mask to constrain the ripple to the bounds of the view. --> - <item android:drawable="@android:color/transparent" /> + <item android:id="@android:id/mask"> + <color android:color="@android:color/white" /> + </item> </ripple> diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml index 7dae671ad..53f891c76 100644 --- a/res/drawable/view_pager_tab_background.xml +++ b/res/drawable/view_pager_tab_background.xml @@ -16,10 +16,7 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:tint="@color/tab_ripple_color"> - <item> - <selector> - <item android:state_focused="true" - android:drawable="@drawable/tab_unselected_focused" /> - </selector> + <item android:id="@android:id/mask"> + <color android:color="@android:color/white" /> </item> </ripple>
\ No newline at end of file |