[Internal] Replaced MaterialThemeOverlay#wrap existing public wrap method.

PiperOrigin-RevId: 698796795

Author: hunterstich

catalog/java/io/material/catalog/assets/res/drawable/ic_drawer_menu_open_24px.xml

@@ -0,0 +1,29 @@
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true"
+    tools:ignore="NewApi">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,720v-80L640,640v80L120,720ZM784,680L584,480L784,280l56,56L696,480L840,624l-56,56ZM120,520v-80L520,440v80L120,520ZM120,320v-80L640,240v80L120,320Z"/>
+</vector>

catalog/java/io/material/catalog/navigationrail/NavigationRailSubMenuDemoFragment.java

@@ -83,7 +83,7 @@ public View onCreateDemoView(
             efab.extend();
             navigationRailView.expand();
             button.setContentDescription(getResources().getString(R.string.cat_navigation_rail_collapse_button_description));
-            button.setImageResource(R.drawable.gs_menu_open_vd_theme_24);
+            button.setImageResource(R.drawable.ic_drawer_menu_open_24px);
           }
         });
     return view;

lib/java/com/google/android/material/button/MaterialButton.java

@@ -265,7 +265,7 @@ public MaterialButton(@NonNull Context context, @Nullable AttributeSet attrs) {
 
   public MaterialButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(
-        wrap(context, attrs, defStyleAttr, DEF_STYLE_RES, MATERIAL_SIZE_OVERLAY_ATTR),
+        wrap(context, attrs, defStyleAttr, DEF_STYLE_RES, new int[] { MATERIAL_SIZE_OVERLAY_ATTR }),
         attrs,
         defStyleAttr);
     // Ensure we are using the correctly themed context rather than the context that was passed in.

lib/java/com/google/android/material/theme/overlay/MaterialThemeOverlay.java

@@ -50,19 +50,44 @@ private MaterialThemeOverlay() {}
   private static final int[] MATERIAL_THEME_OVERLAY_ATTR = new int[] {R.attr.materialThemeOverlay};
 
   /**
-   * Uses the materialThemeOverlay attribute to create a themed context. This allows us to use
-   * MaterialThemeOverlay with a default style, and gives us some protection against losing our
-   * ThemeOverlay by clients who set android:theme or app:theme. If android:theme or app:theme is
-   * specified by the client, any attributes defined there will take precedence over attributes
-   * defined in materialThemeOverlay.
+   * Uses the materialThemeOverlay attribute to create a themed context.
+   *
+   * <p>This allows us to use MaterialThemeOverlay with a default style, and gives us some
+   * protection against losing our ThemeOverlay by clients who set android:theme or app:theme.
+   * If android:theme or app:theme is specified by the client, any attributes defined there
+   * will take precedence over attributes defined in materialThemeOverlay.
+   */
+  @NonNull
+  public static Context wrap(
+      @NonNull Context context,
+      @Nullable AttributeSet set,
+      @AttrRes int defStyleAttr,
+      @StyleRes int defStyleRes) {
+    return wrap(context, set, defStyleAttr, defStyleRes, new int[] {});
+  }
+
+  /**
+   * Uses the materialThemeOverlay attribute and optionalAttr attributes to create a combined
+   * themed context.
+   *
+   * <p>The final theme overlay will apply materialThemeOverlay first, then the optionalAttr
+   * overlays in order.
+   *
+   * <p>This facilitates creating locally scoped, re-usable overlays for component variants. For
+   * example, if buttons can be one of two colors and one of three shapes, instead of creating a
+   * style for each color-shape combination, an overlay can be created for each color and
+   * each shape. The button can then wrap its context and pass both overlay attributes to
+   * optionalAttrs before reading color and shape values.
+   *
+   * @see #wrap(Context, AttributeSet, int, int)
    */
   @NonNull
   public static Context wrap(
       @NonNull Context context,
       @Nullable AttributeSet set,
       @AttrRes int defStyleAttr,
       @StyleRes int defStyleRes,
-      @NonNull int... optionalAttrs) {
+      @NonNull int[] optionalAttrs) {
     int materialThemeOverlayId =
         obtainMaterialThemeOverlayId(context, set, defStyleAttr, defStyleRes);
     boolean contextHasOverlay =