Merge "TouchFeedbackDrawable is now RippleDrawable"

This commit is contained in:
Alan Viverette
2014-05-19 23:51:38 +00:00
committed by Android (Google) Code Review
4 changed files with 16 additions and 12 deletions

View File

@@ -14,10 +14,10 @@
limitations under the License.
-->
<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?android:attr/colorButtonPressed">
<item>
<color android:color="@android:color/white" />
</item>
</touch-feedback>
</ripple>

View File

@@ -14,10 +14,10 @@
limitations under the License.
-->
<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?android:attr/colorButtonPressed"
android:pinned="true">
<item android:id="@android:id/mask"
android:drawable="@android:color/white" />
</touch-feedback>
</ripple>