[M3][Search] Fix Search view prefix style.

PiperOrigin-RevId: 524945100
material-components · Apr 19, 2023 · e56e9b1 · e56e9b1
1 parent 7bd9724
commit e56e9b1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -141,12 +141,15 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
+    <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</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="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
-    <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
-    <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
     <item name="sliderStyle">@style/Widget.Material3.Slider</item>
     <item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
     <item name="snackbarButtonStyle">@style/Widget.Material3.Button.TextButton.Snackbar</item>
@@ -399,12 +402,15 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
+    <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</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="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
-    <item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
-    <item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
     <item name="sliderStyle">@style/Widget.Material3.Slider</item>
     <item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
     <item name="snackbarButtonStyle">@style/Widget.Material3.Button.TextButton.Snackbar</item>

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
@@ -156,13 +156,14 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
-    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
-    <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
-    <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="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="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+    <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
+    <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</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>
@@ -419,13 +420,14 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
-    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
-    <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
-    <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="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="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+    <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
+    <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</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>

diff --git a/lib/javatests/com/google/android/material/theme/ThemeTest.java b/lib/javatests/com/google/android/material/theme/ThemeTest.java
@@ -401,10 +401,13 @@ public class ThemeTest {
           R.attr.materialCardViewOutlinedStyle,
           R.attr.materialCardViewFilledStyle,
           R.attr.materialCardViewElevatedStyle,
-          R.attr.materialSwitchStyle,
-          R.attr.radioButtonStyle,
           R.attr.materialSearchBarStyle,
           R.attr.materialSearchViewStyle,
+          R.attr.materialSearchViewPrefixStyle,
+          R.attr.materialSearchViewToolbarHeight,
+          R.attr.materialSearchViewToolbarStyle,
+          R.attr.materialSwitchStyle,
+          R.attr.radioButtonStyle,
           R.attr.sliderStyle,
           R.attr.snackbarStyle,
           R.attr.snackbarButtonStyle,