Fix MaterialShapeDrawable bug that causes compat shadows to be drawn for round rects on lollipop+

dsn5ft · afohrman · commit c0de00cdac2b · 2019-02-27T18:00:21.000-05:00
PiperOrigin-RevId: 235786787
diff --git a/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java b/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java
@@ -623,7 +623,8 @@ public void setShadowRadius(int shadowRadius) {
    * 21 or when the shape is concave.
    */
   private boolean requiresCompatShadow() {
-    return VERSION.SDK_INT < VERSION_CODES.LOLLIPOP || !path.isConvex();
+    return VERSION.SDK_INT < VERSION_CODES.LOLLIPOP
+        || (!drawableState.shapeAppearanceModel.isRoundRect() && !path.isConvex());
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,8 @@ public void setShadowRadius(int shadowRadius) {`
`623`	`623`	`* 21 or when the shape is concave.`
`624`	`624`	`*/`
`625`	`625`	`private boolean requiresCompatShadow() {`
`626`		`- return VERSION.SDK_INT < VERSION_CODES.LOLLIPOP \|\| !path.isConvex();`
	`626`	`+ return VERSION.SDK_INT < VERSION_CODES.LOLLIPOP`
	`627`	`+ \|\| (!drawableState.shapeAppearanceModel.isRoundRect() && !path.isConvex());`
`627`	`628`	`}`
`628`	`629`
`629`	`630`	`/**`