[Bottomsheets][Large Screens] Adding a max width for bottom sheets to optimize for large screens.

PiperOrigin-RevId: 368533002 (cherry picked from commit ce928fc)

Author: leticiarossi

lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java

@@ -51,6 +51,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
@@ -194,6 +195,8 @@ public abstract static class BottomSheetCallback {
 
  private static final int CORNER_ANIMATION_DURATION = 500;
 
+ private static final int NO_WIDTH = -1;
+
  private boolean fitToContents = true;
 
  private boolean updateImportantForAccessibilityOnSiblings = false;
@@ -217,6 +220,8 @@ public abstract static class BottomSheetCallback {
 
  private MaterialShapeDrawable materialShapeDrawable;
 
+ private int maxWidth = NO_WIDTH;
+
  private int gestureInsetBottom;
  private boolean gestureInsetBottomIgnored;
  private boolean paddingBottomSystemWindowInsets;
@@ -313,6 +318,12 @@ public BottomSheetBehavior(@NonNull Context context, @Nullable AttributeSet attr
  this.elevation = a.getDimension(R.styleable.BottomSheetBehavior_Layout_android_elevation, -1);
  }
 
+ if (a.hasValue(R.styleable.BottomSheetBehavior_Layout_android_maxWidth)) {
+ setMaxWidth(
+ a.getDimensionPixelSize(
+ R.styleable.BottomSheetBehavior_Layout_android_maxWidth, NO_WIDTH));
+ }
+
  TypedValue value = a.peekValue(R.styleable.BottomSheetBehavior_Layout_behavior_peekHeight);
  if (value != null && value.data == PEEK_HEIGHT_AUTO) {
  setPeekHeight(value.data);
@@ -399,7 +410,7 @@ public void onDetachedFromLayoutParams() {
 
  @Override
  public boolean onLayoutChild(
- @NonNull CoordinatorLayout parent, @NonNull V child, int layoutDirection) {
+ @NonNull CoordinatorLayout parent, @NonNull final V child, int layoutDirection) {
  if (ViewCompat.getFitsSystemWindows(parent) && !ViewCompat.getFitsSystemWindows(child)) {
  child.setFitsSystemWindows(true);
  }
@@ -429,6 +440,19 @@ public boolean onLayoutChild(
  == ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
  ViewCompat.setImportantForAccessibility(child, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
  }
+
+ // Adjust the width to be at most the maxWidth if needed.
+ int width = child.getMeasuredWidth();
+ if (width > maxWidth && maxWidth != NO_WIDTH) {
+ final ViewGroup.LayoutParams lp = child.getLayoutParams();
+ lp.width = maxWidth;
+ child.post(new Runnable() {
+ @Override
+ public void run() {
+ child.setLayoutParams(lp);
+ }
+ });
+ }
  }
  if (viewDragHelper == null) {
  viewDragHelper = ViewDragHelper.create(parent, dragCallback);
@@ -781,6 +805,30 @@ public void setFitToContents(boolean fitToContents) {
  updateAccessibilityActions();
  }
 
+ /**
+ * Sets the maximum width of the bottom sheet. The layout will be at most this dimension wide.
+ * This method should be called before {@link BottomSheetDialog#show()} in order for the width to
+ * be adjusted as expected.
+ *
+ * @param maxWidth The maximum width in pixels to be set
+ * @attr ref com.google.android.material.R.styleable#BottomSheetBehavior_Layout_android_maxWidth
+ * @see #getMaxWidth()
+ */
+ public void setMaxWidth(@Px int maxWidth) {
+ this.maxWidth = maxWidth;
+ }
+
+ /**
+ * Returns the bottom sheet's maximum width, or -1 if no maximum width is set.
+ *
+ * @attr ref com.google.android.material.R.styleable#BottomSheetBehavior_Layout_android_maxWidth
+ * @see #setMaxWidth(int)
+ */
+ @Px
+ public int getMaxWidth() {
+ return maxWidth;
+ }
+
  /**
  * Sets the height of the bottom sheet when it is collapsed.
  *

lib/java/com/google/android/material/bottomsheet/res/values/attrs.xml

@@ -82,6 +82,7 @@
  <attr name="paddingRightSystemWindowInsets" />
  <attr name="paddingTopSystemWindowInsets" />
  <attr name="android:elevation"/>
+ <attr name="android:maxWidth"/>
 
  </declare-styleable>
 

lib/java/com/google/android/material/bottomsheet/res/values/dimens.xml

@@ -20,4 +20,6 @@
  <dimen name="design_bottom_sheet_elevation">8dp</dimen>
  <dimen name="design_bottom_sheet_peek_height_min">64dp</dimen>
 
+ <dimen name="material_bottom_sheet_max_width">640dp</dimen>
+
 </resources>

lib/java/com/google/android/material/bottomsheet/res/values/styles.xml

@@ -43,12 +43,14 @@
  <style name="Widget.MaterialComponents.BottomSheet" parent="Widget.Design.BottomSheet.Modal">
  <item name="enforceMaterialTheme">true</item>
  <item name="android:background">@null</item>
+ <item name="android:layout_gravity">center_horizontal</item>
  <item name="shapeAppearance">?attr/shapeAppearanceLargeComponent</item>
  <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialComponents.BottomSheet</item>
  <item name="backgroundTint">?attr/colorSurface</item>
  <item name="android:elevation" tools:ignore="NewApi">
  @dimen/design_bottom_sheet_elevation
  </item>
+ <item name="android:maxWidth">@dimen/material_bottom_sheet_max_width</item>
  </style>
 
  <style name="Widget.MaterialComponents.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet">