[M3][SearchBar][SearchView] Updated style to match updated M3 spec.

PiperOrigin-RevId: 491980034
material-components · Nov 30, 2022 · dc2e973 · dc2e973
1 parent 8ee6c00
commit dc2e973
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/lib/java/com/google/android/material/search/res/layout/mtrl_search_view.xml b/lib/java/com/google/android/material/search/res/layout/mtrl_search_view.xml
@@ -75,7 +75,7 @@
 
           <LinearLayout
               android:layout_width="match_parent"
-              android:layout_height="@dimen/m3_searchbar_height"
+              android:layout_height="@dimen/m3_searchview_height"
               android:gravity="center_vertical"
               android:orientation="horizontal">
 

diff --git a/lib/java/com/google/android/material/search/res/values/dimens.xml b/lib/java/com/google/android/material/search/res/values/dimens.xml
@@ -15,17 +15,17 @@
   ~ limitations under the License.
 -->
 <resources>
-
-  <dimen name="m3_searchbar_height">48dp</dimen>
-  <dimen name="m3_searchbar_elevation">3dp</dimen>
-  <dimen name="m3_searchbar_radius">8dp</dimen>
+  <dimen name="m3_searchbar_height">@dimen/m3_comp_search_bar_container_height</dimen>
+  <dimen name="m3_searchbar_elevation">@dimen/m3_comp_search_bar_container_elevation</dimen>
   <dimen name="m3_searchbar_text_size">16sp</dimen>
   <dimen name="m3_searchbar_text_margin_start_no_navigation_icon">16dp</dimen>
   <dimen name="m3_searchbar_margin_horizontal">16dp</dimen>
-  <dimen name="m3_searchbar_margin_vertical">8dp</dimen>
+  <dimen name="m3_searchbar_margin_vertical">16dp</dimen>
   <dimen name="m3_searchbar_padding_start">4dp</dimen>
+  <dimen name="m3_searchbar_outlined_stroke_width">1dp</dimen>
 
-  <dimen name="m3_searchview_elevation">6dp</dimen>
+  <dimen name="m3_searchview_height">@dimen/m3_comp_search_view_docked_header_container_height</dimen>
+  <dimen name="m3_searchview_elevation">@dimen/m3_comp_search_view_container_elevation</dimen>
   <dimen name="m3_searchview_divider_size">1dp</dimen>
 
 </resources>
diff --git a/lib/java/com/google/android/material/search/res/values/styles.xml b/lib/java/com/google/android/material/search/res/values/styles.xml
@@ -29,18 +29,23 @@
     <item name="shapeAppearance">?attr/shapeAppearanceMediumComponent</item>
     <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.SearchBar</item>
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Search</item>
+
+    <!-- On newer API levels, hide shadows while keeping elevation. -->
+    <item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
+    <item name="android:outlineSpotShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
   </style>
 
   <style name="Widget.Material3.SearchBar.Outlined">
     <item name="elevation">0dp</item>
-    <item name="strokeWidth">1dp</item>
+    <item name="strokeWidth">@dimen/m3_searchbar_outlined_stroke_width</item>
     <item name="strokeColor">?attr/colorOutline</item>
   </style>
 
   <style name="Widget.Material3.SearchView" parent="android:Widget">
     <item name="enforceMaterialTheme">true</item>
     <item name="android:elevation">@dimen/m3_searchview_elevation</item>
     <item name="android:textAppearance">@style/TextAppearance.Material3.SearchView</item>
+    <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.SearchView</item>
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Search</item>
   </style>
 
@@ -75,9 +80,10 @@
     <item name="android:textColor">?android:attr/textColorTertiary</item>
   </style>
 
-  <style name="ShapeAppearanceOverlay.Material3.SearchBar" parent="">
-    <item name="cornerSize">@dimen/m3_searchbar_radius</item>
-  </style>
+  <style name="ShapeAppearanceOverlay.Material3.SearchBar"
+         parent="ShapeAppearance.M3.Comp.SearchBar.Container.Shape" />
+  <style name="ShapeAppearanceOverlay.Material3.SearchView"
+         parent="ShapeAppearance.M3.Comp.SearchView.FullScreen.Container.Shape" />
 
   <style name="ThemeOverlay.Material3.Search" parent="">
     <item name="actionMenuTextColor">?attr/colorOnSurfaceVariant</item>