[M3][Search] Updated search styles to set the default style attribute…

…s in the related theme overlay. PiperOrigin-RevId: 523789226
material-components · Apr 13, 2023 · 9ffaa8d · 9ffaa8d
1 parent 4d50aa4
commit 9ffaa8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
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
@@ -102,6 +102,9 @@
     <item name="actionMenuTextColor">?attr/colorOnSurfaceVariant</item>
     <item name="colorControlNormal">?attr/colorOnSurfaceVariant</item>
     <item name="actionOverflowButtonStyle">@style/Widget.Material3.Search.ActionButton.Overflow</item>
+    <item name="materialSearchViewPrefixStyle">@style/Widget.Material3.SearchView.Prefix</item>
+    <item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
+    <item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
     <item name="toolbarNavigationButtonStyle">@style/Widget.Material3.Search.Toolbar.Button.Navigation</item>
   </style>
 

diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -161,8 +161,6 @@
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
     <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
-    <item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
-    <item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
     <item name="sliderStyle">@style/Widget.Material3.Slider</item>
     <item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
@@ -424,8 +422,6 @@
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
     <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
-    <item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
-    <item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
     <item name="sliderStyle">@style/Widget.Material3.Slider</item>
     <item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>