commit 979f413d2437fd4c9a28767343ec7c2aadf8dbf1
author Yorke Lee <yorkelee@google.com> Tue Sep 16 09:02:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 16 09:02:29 2014 +0000
tree a507fa7e405e6dc8d472c9b62efbbfdbee46100b
parent ef44029c89ab1b347f1ef2eff3fc5d35207392a0
parent b186bb879f1f9fea08297c0fa98cd2e0bb2df287

am b186bb87: am 60a154d6: am 781dc9c3: Make FAB button ripple bounded

* commit 'b186bb879f1f9fea08297c0fa98cd2e0bb2df287':
  Make FAB button ripple bounded

res/drawable/floating_action_button.xml

diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index e5ae14a..d550190 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