[MaterialShapeDrawable] Update ShapeAppearanceModel.Builder to not use extra ContextThemeWrapper for shape appearance overlay due to performance concerns

dsn5ft · kendrickumstattd · commit d16a19364c91 · 2025-05-23T21:53:22.000Z
PiperOrigin-RevId: 762498280
diff --git a/lib/java/com/google/android/material/shape/ShapeAppearanceModel.java b/lib/java/com/google/android/material/shape/ShapeAppearanceModel.java
@@ -533,7 +533,7 @@ private static Builder builder(
     // Note: we need to wrap shape appearance and shape appearance overlay to workaround b/230755281
     context = new ContextThemeWrapper(context, shapeAppearanceResId);
     if (shapeAppearanceOverlayResId != 0) {
-      context = new ContextThemeWrapper(context, shapeAppearanceOverlayResId);
+      context.getTheme().applyStyle(shapeAppearanceOverlayResId, /* force= */ true);
     }
     TypedArray a = context.obtainStyledAttributes(R.styleable.ShapeAppearance);
 

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ private static Builder builder(`
`533`	`533`	`// Note: we need to wrap shape appearance and shape appearance overlay to workaround b/230755281`
`534`	`534`	`context = new ContextThemeWrapper(context, shapeAppearanceResId);`
`535`	`535`	`if (shapeAppearanceOverlayResId != 0) {`
`536`		`- context = new ContextThemeWrapper(context, shapeAppearanceOverlayResId);`
	`536`	`+ context.getTheme().applyStyle(shapeAppearanceOverlayResId, /* force= */ true);`
`537`	`537`	`}`
`538`	`538`	`TypedArray a = context.obtainStyledAttributes(R.styleable.ShapeAppearance);`
`539`	`539`