commit 6afcf2fb4dd65a6d7b3ae4cff09970bdf8256887
author Mihai Popa <popam@google.com> Wed Apr 11 22:14:51 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 22:14:51 2018 +0000
tree 8854ca058d146e8ff786f4853f29ef4e709ae646
parent a512d304ca30614418226d040996e4e77505b621
parent 17f91d5413d53674aefb8995bdbbb41cdc0c8811

Merge "Fix ripple effect for floating toolbar menu items" into pi-dev

core/java/com/android/internal/widget/FloatingToolbar.java

diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index 35aae15..2ce5a0b 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -1706,6 +1706,7 @@
         contentContainer.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         contentContainer.setTag(FLOATING_TOOLBAR_TAG);
+        contentContainer.setClipToOutline(true);
         return contentContainer;
     }