Replaced the selectors with the ones from cabinet to fix the ripple flickering bug.

This commit is contained in:
Karim Abou Zeid 2015-05-21 18:27:22 +02:00
commit 5dd57ef3ed
24 changed files with 64 additions and 78 deletions

View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector" />
</ripple>

View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector_dark" />
</ripple>

View file

@ -0,0 +1,15 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_light">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@color/ripple_material_light" />
</selector>
</item>
</ripple>

View file

@ -0,0 +1,15 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_dark">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@color/ripple_material_dark" />
</selector>
</item>
</ripple>

View file

@ -1,7 +1,8 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/round_ripple_selector_mask" />
</ripple>

View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/round_selector_dark" />
</ripple>

View file

@ -1,5 +1,5 @@
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@android:color/white" />
</shape>