From 3b278d709756e0a0d2ba856697ef4bcb76ae1544 Mon Sep 17 00:00:00 2001
From: dsn5ft <1420597+dsn5ft@users.noreply.github.com>
Date: Thu, 14 Dec 2023 14:11:15 +0000
Subject: [PATCH] [Side Sheet] Move modal side sheet default width/height into
 style so they can be customized

Resolves https://github.com/material-components/material-components-android/issues/3492

PiperOrigin-RevId: 590915421
---
 .../material/sidesheet/res/layout/m3_side_sheet_dialog.xml   | 2 --
 .../google/android/material/sidesheet/res/values/styles.xml  | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/java/com/google/android/material/sidesheet/res/layout/m3_side_sheet_dialog.xml b/lib/java/com/google/android/material/sidesheet/res/layout/m3_side_sheet_dialog.xml
index e20c55dc4f7..8a783d1d2af 100644
--- a/lib/java/com/google/android/material/sidesheet/res/layout/m3_side_sheet_dialog.xml
+++ b/lib/java/com/google/android/material/sidesheet/res/layout/m3_side_sheet_dialog.xml
@@ -41,8 +41,6 @@
     <FrameLayout
         android:id="@+id/m3_side_sheet"
         style="?attr/sideSheetModalStyle"
-        android:layout_width="@dimen/m3_side_sheet_width"
-        android:layout_height="match_parent"
         app:layout_behavior="@string/side_sheet_behavior"/>
 
   </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/lib/java/com/google/android/material/sidesheet/res/values/styles.xml b/lib/java/com/google/android/material/sidesheet/res/values/styles.xml
index c61e6d439e1..baef7521ff9 100644
--- a/lib/java/com/google/android/material/sidesheet/res/values/styles.xml
+++ b/lib/java/com/google/android/material/sidesheet/res/values/styles.xml
@@ -40,6 +40,11 @@
 
   <!-- Style for the M3 Modal Side Sheet. -->
   <style name="Widget.Material3.SideSheet.Modal">
+    <!-- Layout_* attributes break when set via a default style, but it's ok to
+         set layout_* attributes from this style, because this style is set
+         explicitly on the modal side sheet View. -->
+    <item name="android:layout_width">@dimen/m3_side_sheet_width</item>
+    <item name="android:layout_height">match_parent</item>
     <item name="android:elevation" tools:ignore="NewApi">@dimen/m3_side_sheet_modal_elevation</item>
     <item name="backgroundTint">@macro/m3_comp_sheet_side_docked_modal_container_color</item>
     <item name="shapeAppearance">@macro/m3_comp_sheet_side_docked_modal_container_shape</item>