summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-09-16 09:02:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 09:02:29 +0000
commit979f413d2437fd4c9a28767343ec7c2aadf8dbf1 (patch)
treea507fa7e405e6dc8d472c9b62efbbfdbee46100b /res
parentef44029c89ab1b347f1ef2eff3fc5d35207392a0 (diff)
parentb186bb879f1f9fea08297c0fa98cd2e0bb2df287 (diff)
am b186bb87: am 60a154d6: am 781dc9c3: Make FAB button ripple bounded
* commit 'b186bb879f1f9fea08297c0fa98cd2e0bb2df287': Make FAB button ripple bounded
Diffstat (limited to 'res')
-rw-r--r--res/drawable/floating_action_button.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index e5ae14a2b..d550190a8 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,4 +16,10 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/floating_action_button_touch_tint" /> \ No newline at end of file
+ android:color="@color/floating_action_button_touch_tint">
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@android:color/white" />
+ </shape>
+ </item>
+</ripple> \ No newline at end of file