[SearchBar] Add attribute to control when to impose max width based on a percentage of available width in parent

PiperOrigin-RevId: 758280412

Author: imhappi

docs/components/Search.md

@@ -99,19 +99,20 @@ The following is an anatomy diagram for the search bar:
 
 The following attributes can be changed for `SearchBar`:
 
-Element                      | Attribute                   | Related method(s)                           | Default value
----------------------------- | --------------------------- | ------------------------------------------- | -------------
-**Max Width**                | `android:maxWidth`          | `setMaxWidth`<br/>`getMaxWidth`             | `-1` (unset)
-**Min height**               | `android:minHeight`         | `setMinHeight`<br/>`getMinHeight`           | `@dimen/m3_searchbar_height`
-**Search text appearance**   | `android:textAppearance`    | `setTextAppearance`<br/>`getTextAppearance` | `@style/TextAppearance.Material3.SearchBar`
-**Search text**              | `android:text`              | `setText`<br/>`getText`                     | `null`
-**Search hint**              | `android:hint`              | `setHint`<br/>`getHint`                     | `null`
-**Search text centered**     | `app:textCentered`          | `setTextCentered`<br/>`getTextCentered`     | `false`
-**Color**                    | `app:backgroundTint`        | --                                          | `?attr/colorSurfaceContainerHigh`
-**Lift On Scroll**           | `app:liftOnScroll`          | --                                          | `false`
-**Lift On Scroll Color**     | `app:liftOnScrollColor`     | --                                          | `?attr/colorSurfaceContainerHighest`
-**Flag for default margins** | `app:defaultMarginsEnabled` | --                                          | `true`
-**Flag for navigation icon** | `app:hideNavigationIcon`    | --                                          | `false`
+Element                                  | Attribute                     | Related method(s)                           | Default value
+---------------------------------------- | ----------------------------- | ------------------------------------------- | -------------
+**Max Width**                            | `android:maxWidth`            | `setMaxWidth`<br/>`getMaxWidth`             | `-1` (unset)
+**Flag for enabling adaptive max width** | `app:adaptiveMaxWidthEnabled` | --                                          | `false`
+**Min height**                           | `android:minHeight`           | `setMinHeight`<br/>`getMinHeight`           | `@dimen/m3_searchbar_height`
+**Search text appearance**               | `android:textAppearance`      | `setTextAppearance`<br/>`getTextAppearance` | `@style/TextAppearance.Material3.SearchBar`
+**Search text**                          | `android:text`                | `setText`<br/>`getText`                     | `null`
+**Search hint**                          | `android:hint`                | `setHint`<br/>`getHint`                     | `null`
+**Search text centered**                 | `app:textCentered`            | `setTextCentered`<br/>`getTextCentered`     | `false`
+**Color**                                | `app:backgroundTint`          | --                                          | `?attr/colorSurfaceContainerHigh`
+**Lift On Scroll**                       | `app:liftOnScroll`            | --                                          | `false`
+**Lift On Scroll Color**                 | `app:liftOnScrollColor`       | --                                          | `?attr/colorSurfaceContainerHighest`
+**Flag for default margins**             | `app:defaultMarginsEnabled`   | --                                          | `true`
+**Flag for navigation icon**             | `app:hideNavigationIcon`      | --                                          | `false`
 
 ## Styles
 

lib/java/com/google/android/material/search/SearchBar.java

@@ -157,9 +157,15 @@ public class SearchBar extends Toolbar {
   private MaterialShapeDrawable backgroundShape;
   private boolean textCentered;
   private int maxWidth;
+  private final boolean adaptiveMaxWidthEnabled;
+  private final int adaptiveMaxWidthParentBreakpoint;
   @Nullable private ActionMenuView menuView;
   @Nullable private ImageButton navIconButton;
 
+  // The percentage of the available width that the SearchBar should be at after the specified
+  // breakpoint in the measure pass.
+  private static final float ADAPTIVE_MAX_WIDTH_PERCENT_AFTER_BREAKPOINT = 0.5f;
+
   private final LiftOnScrollProgressListener liftColorListener =
       new LiftOnScrollProgressListener() {
 
@@ -187,6 +193,8 @@ public SearchBar(@NonNull Context context, @Nullable AttributeSet attrs, int def
     context = getContext();
     validateAttributes(attrs);
 
+    adaptiveMaxWidthParentBreakpoint =
+        getResources().getDimensionPixelSize(R.dimen.m3_searchbar_parent_width_breakpoint);
     defaultNavigationIcon =
         AppCompatResources.getDrawable(context, getDefaultNavigationIconResource());
     searchBarAnimationHelper = new SearchBarAnimationHelper();
@@ -218,6 +226,7 @@ public SearchBar(@NonNull Context context, @Nullable AttributeSet attrs, int def
     textCentered = a.getBoolean(R.styleable.SearchBar_textCentered, false);
     liftOnScroll = a.getBoolean(R.styleable.SearchBar_liftOnScroll, false);
     maxWidth = a.getDimensionPixelSize(R.styleable.SearchBar_android_maxWidth, -1);
+    adaptiveMaxWidthEnabled = a.getBoolean(R.styleable.SearchBar_adaptiveMaxWidthEnabled, false);
 
     a.recycle();
 
@@ -419,9 +428,16 @@ public void inflateMenu(@MenuRes int resId) {
 
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    if (maxWidth >= 0 && maxWidth < MeasureSpec.getSize(widthMeasureSpec)) {
-      int measureMode = MeasureSpec.getMode(widthMeasureSpec);
+    int availableWidth = MeasureSpec.getSize(widthMeasureSpec);
+    int measureMode = MeasureSpec.getMode(widthMeasureSpec);
+    if (maxWidth >= 0 && availableWidth > maxWidth) {
       widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidth, measureMode);
+    } else if (adaptiveMaxWidthEnabled && availableWidth > adaptiveMaxWidthParentBreakpoint) {
+      int newWidth =
+          max(
+              adaptiveMaxWidthParentBreakpoint,
+              Math.round(ADAPTIVE_MAX_WIDTH_PERCENT_AFTER_BREAKPOINT * availableWidth));
+      widthMeasureSpec = MeasureSpec.makeMeasureSpec(newWidth, measureMode);
     }
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 

lib/java/com/google/android/material/search/res-public/values/public.xml

@@ -24,6 +24,7 @@
   <public name="materialSearchViewToolbarHeight" type="attr"/>
   <public name="defaultMarginsEnabled" type="attr"/>
   <public name="defaultScrollFlagsEnabled" type="attr"/>
+  <public name="adaptiveMaxWidthEnabled" type="attr"/>
   <public name="hideNavigationIcon" type="attr"/>
   <public name="forceDefaultNavigationOnClickListener" type="attr"/>
   <public name="tintNavigationIcon" type="attr"/>

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

@@ -71,8 +71,11 @@
     <attr name="liftOnScroll"/>
     <!-- The color of the SearchBar when lifted. If null, the search bar color will not change.  -->
     <attr name="liftOnScrollColor"/>
-    <!-- The max width the SearchBar can be. If the SearchBar width is set explicitly, it will ignore this value. -->
+    <!-- The max width the SearchBar can be. -->
     <attr name="android:maxWidth"/>
+    <!-- Whether or not to set an adaptive maximum width on the SearchBar based on the available width in the parent view.
+         If the max width is set explicitly, it will take precedence over this attribute. -->
+    <attr name="adaptiveMaxWidthEnabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="SearchView">

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

@@ -28,4 +28,6 @@
   <dimen name="m3_searchview_elevation">@dimen/m3_comp_search_view_container_elevation</dimen>
   <dimen name="m3_searchview_divider_size">1dp</dimen>
 
+  <dimen name="m3_searchbar_parent_width_breakpoint">312dp</dimen>
+
 </resources>

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

@@ -24,7 +24,6 @@
     <item name="liftOnScroll">true</item>
     <item name="contentInsetStart">24dp</item>
     <item name="android:paddingEnd">4dp</item>
-    <item name="android:maxWidth">720dp</item>
   </style>
 
   <style name="Widget.Material3Expressive.SearchBar.CenteredText">
@@ -43,20 +42,20 @@
   <style name="Widget.Material3Expressive.SearchView" parent="Widget.Material3.SearchView"/>
 
   <style name="Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch">
-    <item name="android:maxWidth">312dp</item>
     <item name="defaultMarginsEnabled">false</item>
     <item name="android:layout_gravity">center</item>
     <item name="android:layout_marginStart">8dp</item>
     <item name="android:layout_marginEnd">8dp</item>
+    <item name="adaptiveMaxWidthEnabled">true</item>
   </style>
 
   <style name="Widget.Material3Expressive.SearchBar.AppBarWithSearch">
-    <item name="android:maxWidth">312dp</item>
     <item name="defaultMarginsEnabled">false</item>
     <item name="hideNavigationIcon">true</item>
     <item name="android:layout_gravity">center</item>
     <item name="android:layout_marginStart">8dp</item>
     <item name="android:layout_marginEnd">8dp</item>
+    <item name="adaptiveMaxWidthEnabled">true</item>
   </style>
 
   <style name="Widget.Material3Expressive.AppBarLayout.AppBarWithSearch">