Skip to content

Commit e56e9b1

Browse files
raajkumarsdrchen
raajkumars
authored and
drchen
committed
[M3][Search] Fix Search view prefix style.
PiperOrigin-RevId: 524945100
1 parent 7bd9724 commit e56e9b1

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

‎lib/java/com/google/android/material/dialog/res/values/themes_base.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,15 @@
141141
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
142142
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
143143
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
144+
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
145+
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
146+
<item name="materialSearchViewPrefixStyle">@style/Widget.Material3.SearchView.Prefix</item>
147+
<item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
148+
<item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
144149
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
145150
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
146151
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
147152
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
148-
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
149-
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
150153
<item name="sliderStyle">@style/Widget.Material3.Slider</item>
151154
<item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
152155
<item name="snackbarButtonStyle">@style/Widget.Material3.Button.TextButton.Snackbar</item>
@@ -399,12 +402,15 @@
399402
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
400403
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
401404
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
405+
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
406+
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
407+
<item name="materialSearchViewPrefixStyle">@style/Widget.Material3.SearchView.Prefix</item>
408+
<item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
409+
<item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
402410
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
403411
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
404412
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
405413
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
406-
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
407-
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
408414
<item name="sliderStyle">@style/Widget.Material3.Slider</item>
409415
<item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
410416
<item name="snackbarButtonStyle">@style/Widget.Material3.Button.TextButton.Snackbar</item>

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,14 @@
156156
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
157157
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
158158
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
159-
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
160-
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
161-
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
162159
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
163160
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
161+
<item name="materialSearchViewPrefixStyle">@style/Widget.Material3.SearchView.Prefix</item>
164162
<item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
165163
<item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
164+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
165+
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
166+
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
166167
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
167168
<item name="sliderStyle">@style/Widget.Material3.Slider</item>
168169
<item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>
@@ -419,13 +420,14 @@
419420
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
420421
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
421422
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
422-
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
423-
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
424-
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
425423
<item name="materialSearchBarStyle">@style/Widget.Material3.SearchBar</item>
426424
<item name="materialSearchViewStyle">@style/Widget.Material3.SearchView</item>
425+
<item name="materialSearchViewPrefixStyle">@style/Widget.Material3.SearchView.Prefix</item>
427426
<item name="materialSearchViewToolbarHeight">@dimen/m3_searchview_height</item>
428427
<item name="materialSearchViewToolbarStyle">@style/Widget.Material3.SearchView.Toolbar</item>
428+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
429+
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
430+
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
429431
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
430432
<item name="sliderStyle">@style/Widget.Material3.Slider</item>
431433
<item name="snackbarStyle">@style/Widget.Material3.Snackbar</item>

‎lib/javatests/com/google/android/material/theme/ThemeTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,13 @@ public class ThemeTest {
401401
R.attr.materialCardViewOutlinedStyle,
402402
R.attr.materialCardViewFilledStyle,
403403
R.attr.materialCardViewElevatedStyle,
404-
R.attr.materialSwitchStyle,
405-
R.attr.radioButtonStyle,
406404
R.attr.materialSearchBarStyle,
407405
R.attr.materialSearchViewStyle,
406+
R.attr.materialSearchViewPrefixStyle,
407+
R.attr.materialSearchViewToolbarHeight,
408+
R.attr.materialSearchViewToolbarStyle,
409+
R.attr.materialSwitchStyle,
410+
R.attr.radioButtonStyle,
408411
R.attr.sliderStyle,
409412
R.attr.snackbarStyle,
410413
R.attr.snackbarButtonStyle,

0 commit comments

Comments
 (0)