summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-09-16 16:46:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 16:46:39 +0000
commit9abac14d973e7e99b7f51f0c79690545b6e86ee8 (patch)
treeb20de261ac7d6b8156269796b1948944bce581c6
parentf22b1cefb6716db966b1e2179b7e661a7550a7cb (diff)
parent8468b6deebb9157246a3d4abc7185ff9d3d58b2f (diff)
am 8468b6de: am 781dc9c3: Make FAB button ripple bounded
* commit '8468b6deebb9157246a3d4abc7185ff9d3d58b2f': Make FAB button ripple bounded
-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