Automated g4 rollback of changelist 754982643

PiperOrigin-RevId: 755433180

Author: Material Design Team

docs/components/BottomSheet.md

@@ -562,26 +562,31 @@ bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback)
 <details>
   <summary><h3>Handling insets and fullscreen</h3></summary>
 
-`BottomSheetBehavior` automatically handles window insets by applying padding to
-the top and bottom of the view and margins to the left and right. These
-paddings and margins can be customized by specifying any of the following
-attributes on the view:
+`BottomSheetBehavior` can automatically handle insets (such as for
+[edge to edge](https://developer.android.com/training/gestures/edge-to-edge)) by
+specifying any of these to true on the view:
 
 *   `app:paddingBottomSystemWindowInsets`
 *   `app:paddingLeftSystemWindowInsets`
 *   `app:paddingRightSystemWindowInsets`
 *   `app:paddingTopSystemWindowInsets`
 
-*   `app:marginLeftSystemWindowInsets`
-*   `app:marginRightSystemWindowInsets`
-*   `app:marginTopSystemWindowInsets`
+On API 21 and above the modal bottom sheet will be rendered fullscreen (edge to
+edge) if the navigation bar is transparent and `enableEdgeToEdge` is true.
+To enable edge-to-edge by default for modal bottom sheets, you can override
+`?attr/bottomSheetDialogTheme` like the below example (`enableEdgeToEdge` is
+already true in `ThemeOverlay.Material3.BottomSheetDialog`):
 
-Modal bottom sheets are rendered fullscreen by default. On API 21-34, this can
-be overriden by setting `enableEdgeToEdge` to `false` in your
-`?attr/bottomSheetDialogTheme` ThemeOverlay. On API 35 and above,
-`enableEdgeToEdge` has been deprecated and will no longer take effect. To
-learn more, read about [edge-to-edge enforcement on Android 15](https://developer.android.com/about/versions/15/behavior-changes-15#edge-to-edge).
+```xml
+<style name="AppTheme" parent="Theme.Material3.*">
+  ...
+  <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+</style>
 
+<style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+    <item name="android:navigationBarColor">@android:color/transparent<item>
+</style>
+```
 Insets can be added automatically if any of the padding attributes above are set
 to true in the style, either by updating the style passed to the constructor, or
 by updating the default style specified by the `?attr/bottomSheetDialogTheme`

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

@@ -110,15 +110,12 @@ protected BottomSheetDialog(
   }
 
   private void initialize() {
-    if (VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) {
-      edgeToEdgeEnabled = true;
-      return;
-    }
-
     final TypedArray a = getContext()
         .getTheme()
         .obtainStyledAttributes(new int[] {R.attr.enableEdgeToEdge});
+
     edgeToEdgeEnabled = a.getBoolean(0, false);
+
     a.recycle();
   }
 
@@ -132,10 +129,8 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     Window window = getWindow();
     if (window != null) {
-      if (VERSION.SDK_INT < VERSION_CODES.VANILLA_ICE_CREAM) {
-        // The status bar should always be transparent because of the window animation.
-        window.setStatusBarColor(0);
-      }
+      // The status bar should always be transparent because of the window animation.
+      window.setStatusBarColor(0);
 
       window.addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
       if (VERSION.SDK_INT < VERSION_CODES.M) {
@@ -185,7 +180,9 @@ public void onAttachedToWindow() {
     super.onAttachedToWindow();
     Window window = getWindow();
     if (window != null) {
-      boolean drawEdgeToEdge = shouldDrawEdgeToEdge(window);
+      // If the navigation bar is transparent at all the BottomSheet should be edge to edge.
+      boolean drawEdgeToEdge =
+          edgeToEdgeEnabled && Color.alpha(window.getNavigationBarColor()) < 255;
       if (container != null) {
         container.setFitsSystemWindows(!drawEdgeToEdge);
       }
@@ -202,14 +199,6 @@ public void onAttachedToWindow() {
     updateListeningForBackCallbacks();
   }
 
-  private boolean shouldDrawEdgeToEdge(Window window) {
-    if (VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) {
-      return true;
-    }
-
-    return edgeToEdgeEnabled && Color.alpha(window.getNavigationBarColor()) < 255;
-  }
-
   @Override
   public void onDetachedFromWindow() {
     if (edgeToEdgeCallback != null) {

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

@@ -21,7 +21,6 @@
   <!-- Style to use for modal bottom sheets in this theme. -->
   <attr name="bottomSheetStyle" format="reference"/>
   <!-- Determines if the BottomSheetDialog should be shown in edge to edge mode. -->
-  <!-- Deprecated. Edge to Edge is always enabled on API 35 and above. -->
   <attr name="enableEdgeToEdge" format="boolean" />
   <!-- Style of drag handle views when being used with bottom sheets. -->
   <attr name="bottomSheetDragHandleStyle" format="reference"/>