[Theme] Added missing Shape Attributes to Dialog themes

PiperOrigin-RevId: 789801786
(cherry picked from commit 7fe9ef9)

Author: imhappi

lib/java/com/google/android/material/dialog/res/values/themes_base.xml

@@ -255,11 +255,22 @@
 
     <!-- Shape attributes. -->
     <item name="shapeCornerFamily">@integer/m3_sys_shape_corner_full_corner_family</item>
+    <item name="shapeCornerSizeExtraSmall">@dimen/m3_sys_shape_corner_value_extra_small</item>
+    <item name="shapeCornerSizeSmall">@dimen/m3_sys_shape_corner_value_small</item>
+    <item name="shapeCornerSizeMedium">@dimen/m3_sys_shape_corner_value_medium</item>
+    <item name="shapeCornerSizeLarge">@dimen/m3_sys_shape_corner_value_large</item>
+    <item name="shapeCornerSizeLargeIncreased">@dimen/m3_sys_shape_corner_value_large_increased</item>
+    <item name="shapeCornerSizeExtraLarge">@dimen/m3_sys_shape_corner_value_extra_large</item>
+    <item name="shapeCornerSizeExtraLargeIncreased">@dimen/m3_sys_shape_corner_value_extra_large_increased</item>
+    <item name="shapeCornerSizeExtraExtraLarge">@dimen/m3_sys_shape_corner_value_extra_extra_large</item>
     <item name="shapeAppearanceCornerExtraSmall">@style/ShapeAppearance.Material3.Corner.ExtraSmall</item>
     <item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Material3.Corner.Small</item>
     <item name="shapeAppearanceCornerMedium">@style/ShapeAppearance.Material3.Corner.Medium</item>
     <item name="shapeAppearanceCornerLarge">@style/ShapeAppearance.Material3.Corner.Large</item>
+    <item name="shapeAppearanceCornerLargeIncreased">@style/ShapeAppearance.Material3.Corner.LargeIncreased</item>
     <item name="shapeAppearanceCornerExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraLarge</item>
+    <item name="shapeAppearanceCornerExtraLargeIncreased">@style/ShapeAppearance.Material3.Corner.ExtraLargeIncreased</item>
+    <item name="shapeAppearanceCornerExtraExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraExtraLarge</item>
 
     <!-- Deprecated shape styles. -->
     <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Material3.SmallComponent</item>
@@ -556,11 +567,22 @@
 
     <!-- Shape attributes. -->
     <item name="shapeCornerFamily">@integer/m3_sys_shape_corner_full_corner_family</item>
+    <item name="shapeCornerSizeExtraSmall">@dimen/m3_sys_shape_corner_value_extra_small</item>
+    <item name="shapeCornerSizeSmall">@dimen/m3_sys_shape_corner_value_small</item>
+    <item name="shapeCornerSizeMedium">@dimen/m3_sys_shape_corner_value_medium</item>
+    <item name="shapeCornerSizeLarge">@dimen/m3_sys_shape_corner_value_large</item>
+    <item name="shapeCornerSizeLargeIncreased">@dimen/m3_sys_shape_corner_value_large_increased</item>
+    <item name="shapeCornerSizeExtraLarge">@dimen/m3_sys_shape_corner_value_extra_large</item>
+    <item name="shapeCornerSizeExtraLargeIncreased">@dimen/m3_sys_shape_corner_value_extra_large_increased</item>
+    <item name="shapeCornerSizeExtraExtraLarge">@dimen/m3_sys_shape_corner_value_extra_extra_large</item>
     <item name="shapeAppearanceCornerExtraSmall">@style/ShapeAppearance.Material3.Corner.ExtraSmall</item>
     <item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Material3.Corner.Small</item>
     <item name="shapeAppearanceCornerMedium">@style/ShapeAppearance.Material3.Corner.Medium</item>
     <item name="shapeAppearanceCornerLarge">@style/ShapeAppearance.Material3.Corner.Large</item>
+    <item name="shapeAppearanceCornerLargeIncreased">@style/ShapeAppearance.Material3.Corner.LargeIncreased</item>
     <item name="shapeAppearanceCornerExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraLarge</item>
+    <item name="shapeAppearanceCornerExtraLargeIncreased">@style/ShapeAppearance.Material3.Corner.ExtraLargeIncreased</item>
+    <item name="shapeAppearanceCornerExtraExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraExtraLarge</item>
 
     <!-- Deprecated shape styles. -->
     <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Material3.SmallComponent</item>

lib/javatests/com/google/android/material/theme/ThemeTest.java

@@ -476,6 +476,26 @@ public class ThemeTest {
           R.attr.toolbarStyle,
           R.attr.toolbarSurfaceStyle);
 
+  /** These are shape styles that should be the same for *all* M3 full themes. */
+  private static final ImmutableList<Integer> M3_SHAPE_ATTRIBUTES =
+      ImmutableList.of(
+          R.attr.shapeCornerFamily,
+          R.attr.shapeCornerSizeExtraSmall,
+          R.attr.shapeCornerSizeSmall,
+          R.attr.shapeCornerSizeMedium,
+          R.attr.shapeCornerSizeLarge,
+          R.attr.shapeCornerSizeLargeIncreased,
+          R.attr.shapeCornerSizeExtraExtraLarge,
+          R.attr.shapeCornerSizeExtraLargeIncreased,
+          R.attr.shapeCornerSizeExtraExtraLarge,
+          R.attr.shapeAppearanceCornerExtraSmall,
+          R.attr.shapeAppearanceCornerSmall,
+          R.attr.shapeAppearanceCornerMedium,
+          R.attr.shapeAppearanceCornerLarge,
+          R.attr.shapeAppearanceCornerLargeIncreased,
+          R.attr.shapeAppearanceCornerExtraLarge,
+          R.attr.shapeAppearanceCornerExtraLargeIncreased);
+
   /**
    * These are all the attributes where full themes should match {@code Theme.Material3.Light} or
    * {@code Theme_Material3_Dark}.
@@ -486,6 +506,7 @@ public class ThemeTest {
           .addAll(M3_FULL_TYPOGRAPHY_ATTRIBUTES)
           .addAll(M3_FULL_MOTION_ATTRIBUTES)
           .addAll(M3_COMMON_WIDGET_STYLE_ATTRIBUTES)
+          .addAll(M3_SHAPE_ATTRIBUTES)
           .build();
 
   @Parameters(name = "{0}")
@@ -615,6 +636,10 @@ public static ImmutableList<Object[]> getTestData() {
                 R.style.Theme_Material3_Dark,
                 R.style.Theme_Material3_Light,
                 M3_FULL_MOTION_ATTRIBUTES))
+        // Compare M3 Light and Dark themes - they should have the same shape styles.
+        .addAll(
+            createTestData(
+                R.style.Theme_Material3_Dark, R.style.Theme_Material3_Light, M3_SHAPE_ATTRIBUTES))
         .build();
   }