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

am: 6afcf2fb4d Change-Id: Ic94b1ca619219268a1af233b61cc8df1f380c980
2018-04-11 15:27:59 -07:00
parent 59d653fcf4 6afcf2fb4d
commit 6c909a6681
1 changed files with 1 additions and 0 deletions
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -1706,6 +1706,7 @@ public final class FloatingToolbar {
        contentContainer.setLayoutParams(new ViewGroup.LayoutParams(
                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
        contentContainer.setTag(FLOATING_TOOLBAR_TAG);
+        contentContainer.setClipToOutline(true);
        return contentContainer;
    }