File tree Expand file tree Collapse file tree 9 files changed +21
-21
lines changed
javatests/com/google/android/material/theme
java/com/google/android/material Expand file tree Collapse file tree 9 files changed +21
-21
lines changed Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ Element | Style
9999----------------- | ------------------------------------------------
100100** Search Bar Default style** | ` Widget.Material3.SearchBar `
101101
102- Default search bar style theme attribute: ` ?attr/searchBarStyle ` .
102+ Default search bar style theme attribute: ` ?attr/materialSearchBarStyle ` .
103103
104104### Scrolling Behavior
105105
@@ -217,7 +217,7 @@ Element | Style
217217----------------- | ------------------------------------------------
218218** Search View Default style** | ` Widget.Material3.SearchView `
219219
220- Default search view style theme attribute: ` ?attr/searchViewStyle ` .
220+ Default search view style theme attribute: ` ?attr/materialSearchViewStyle ` .
221221
222222### Expand and Collapse Animations
223223
Original file line number Diff line number Diff line change 126126 <item name =" navigationRailStyle" >@style/Widget.Material3.NavigationRailView</item >
127127 <item name =" navigationViewStyle" >@style/Widget.Material3.NavigationView</item >
128128 <item name =" radioButtonStyle" >@style/Widget.Material3.CompoundButton.RadioButton</item >
129- <item name =" searchBarStyle " >@style/Widget.Material3.SearchBar</item >
130- <item name =" searchViewStyle " >@style/Widget.Material3.SearchView</item >
129+ <item name =" materialSearchBarStyle " >@style/Widget.Material3.SearchBar</item >
130+ <item name =" materialSearchViewStyle " >@style/Widget.Material3.SearchView</item >
131131 <item name =" sliderStyle" >@style/Widget.Material3.Slider</item >
132132 <item name =" snackbarStyle" >@style/Widget.Material3.Snackbar</item >
133133 <item name =" snackbarButtonStyle" >@style/Widget.Material3.Button.TextButton.Snackbar</item >
365365 <item name =" navigationRailStyle" >@style/Widget.Material3.NavigationRailView</item >
366366 <item name =" navigationViewStyle" >@style/Widget.Material3.NavigationView</item >
367367 <item name =" radioButtonStyle" >@style/Widget.Material3.CompoundButton.RadioButton</item >
368- <item name =" searchBarStyle " >@style/Widget.Material3.SearchBar</item >
369- <item name =" searchViewStyle " >@style/Widget.Material3.SearchView</item >
368+ <item name =" materialSearchBarStyle " >@style/Widget.Material3.SearchBar</item >
369+ <item name =" materialSearchViewStyle " >@style/Widget.Material3.SearchView</item >
370370 <item name =" sliderStyle" >@style/Widget.Material3.Slider</item >
371371 <item name =" snackbarStyle" >@style/Widget.Material3.Snackbar</item >
372372 <item name =" snackbarButtonStyle" >@style/Widget.Material3.Button.TextButton.Snackbar</item >
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ public SearchBar(@NonNull Context context) {
108108 }
109109
110110 public SearchBar (@ NonNull Context context , @ Nullable AttributeSet attrs ) {
111- this (context , attrs , R .attr .searchBarStyle );
111+ this (context , attrs , R .attr .materialSearchBarStyle );
112112 }
113113
114114 public SearchBar (@ NonNull Context context , @ Nullable AttributeSet attrs , int defStyleAttr ) {
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ public SearchView(@NonNull Context context) {
116116 }
117117
118118 public SearchView (@ NonNull Context context , @ Nullable AttributeSet attrs ) {
119- this (context , attrs , R .attr .searchViewStyle );
119+ this (context , attrs , R .attr .materialSearchViewStyle );
120120 }
121121
122122 public SearchView (@ NonNull Context context , @ Nullable AttributeSet attrs , int defStyleAttr ) {
Original file line number Diff line number Diff line change 1717
1818<!-- Definitions of attributes to be exposed as public -->
1919<resources >
20- <public name =" searchBarStyle " type =" attr" />
21- <public name =" searchViewStyle " type =" attr" />
22- <public name =" searchViewPrefixStyle " type =" attr" />
20+ <public name =" materialSearchBarStyle " type =" attr" />
21+ <public name =" materialSearchViewStyle " type =" attr" />
22+ <public name =" materialSearchViewPrefixStyle " type =" attr" />
2323 <public name =" defaultMarginsEnabled" type =" attr" />
2424 <public name =" defaultScrollFlagsEnabled" type =" attr" />
2525 <public name =" hideNavigationIcon" type =" attr" />
Original file line number Diff line number Diff line change 8181
8282 <TextView
8383 android : id =" @+id/search_view_search_prefix"
84- style =" ?attr/searchViewPrefixStyle "
84+ style =" ?attr/materialSearchViewPrefixStyle "
8585 android : layout_width =" wrap_content"
8686 android : layout_height =" wrap_content"
8787 android : visibility =" gone" />
Original file line number Diff line number Diff line change 1717<resources >
1818
1919 <!-- Style to use for SearchBars in this theme. -->
20- <attr name =" searchBarStyle " format =" reference" />
20+ <attr name =" materialSearchBarStyle " format =" reference" />
2121 <!-- Style to use for SearchViews in this theme. -->
22- <attr name =" searchViewStyle " format =" reference" />
22+ <attr name =" materialSearchViewStyle " format =" reference" />
2323 <!-- Style to use for SearchView prefixes in this theme. -->
24- <attr name =" searchViewPrefixStyle " format =" reference" />
24+ <attr name =" materialSearchViewPrefixStyle " format =" reference" />
2525 <!-- Attribute to use for hiding the navigation icon in search bar and search view. -->
2626 <attr name =" hideNavigationIcon" format =" boolean" />
2727
Original file line number Diff line number Diff line change 140140 <item name =" materialSwitchStyle" >@style/Widget.Material3.CompoundButton.MaterialSwitch</item >
141141 <item name =" navigationRailStyle" >@style/Widget.Material3.NavigationRailView</item >
142142 <item name =" navigationViewStyle" >@style/Widget.Material3.NavigationView</item >
143- <item name =" searchBarStyle " >@style/Widget.Material3.SearchBar</item >
144- <item name =" searchViewStyle " >@style/Widget.Material3.SearchView</item >
143+ <item name =" materialSearchBarStyle " >@style/Widget.Material3.SearchBar</item >
144+ <item name =" materialSearchViewStyle " >@style/Widget.Material3.SearchView</item >
145145 <item name =" radioButtonStyle" >@style/Widget.Material3.CompoundButton.RadioButton</item >
146146 <item name =" sliderStyle" >@style/Widget.Material3.Slider</item >
147147 <item name =" snackbarStyle" >@style/Widget.Material3.Snackbar</item >
382382 <item name =" materialSwitchStyle" >@style/Widget.Material3.CompoundButton.MaterialSwitch</item >
383383 <item name =" navigationRailStyle" >@style/Widget.Material3.NavigationRailView</item >
384384 <item name =" navigationViewStyle" >@style/Widget.Material3.NavigationView</item >
385- <item name =" searchBarStyle " >@style/Widget.Material3.SearchBar</item >
386- <item name =" searchViewStyle " >@style/Widget.Material3.SearchView</item >
385+ <item name =" materialSearchBarStyle " >@style/Widget.Material3.SearchBar</item >
386+ <item name =" materialSearchViewStyle " >@style/Widget.Material3.SearchView</item >
387387 <item name =" radioButtonStyle" >@style/Widget.Material3.CompoundButton.RadioButton</item >
388388 <item name =" sliderStyle" >@style/Widget.Material3.Slider</item >
389389 <item name =" snackbarStyle" >@style/Widget.Material3.Snackbar</item >
Original file line number Diff line number Diff line change @@ -384,8 +384,8 @@ public class ThemeTest {
384384 R .attr .materialCardViewElevatedStyle ,
385385 R .attr .materialSwitchStyle ,
386386 R .attr .radioButtonStyle ,
387- R .attr .searchBarStyle ,
388- R .attr .searchViewStyle ,
387+ R .attr .materialSearchBarStyle ,
388+ R .attr .materialSearchViewStyle ,
389389 R .attr .sliderStyle ,
390390 R .attr .snackbarStyle ,
391391 R .attr .snackbarButtonStyle ,
You can’t perform that action at this time.
0 commit comments