File tree Expand file tree Collapse file tree 6 files changed +5
-37
lines changed
catalog/java/io/material/catalog/application/theme/res/values
javatests/com/google/android/material/elevation
java/com/google/android/material Expand file tree Collapse file tree 6 files changed +5
-37
lines changed Original file line number Diff line number Diff line change 2626 <item name =" catalogToolbarStyle" >@style/Widget.Catalog.Toolbar</item >
2727 <item name =" catalogToolbarWithCloseButtonStyle" >@style/Widget.Catalog.Toolbar.WithCloseButton</item >
2828 <item name =" windowActionModeOverlay" >true</item >
29-
30- <!-- TODO: Remove the following overrides once they are moved into the library. -->
31- <item name =" elevationOverlaysEnabled" >true</item >
32- <item name =" colorSurface" >#141414</item >
3329 </style >
3430</resources >
Original file line number Diff line number Diff line change 4545 <!-- Dark theme neutral colors. -->
4646 <color name =" design_dark_default_color_background" >#141414</color >
4747 <color name =" design_dark_default_color_on_background" >#FFFFFF</color >
48- <color name =" design_dark_default_color_surface" >#282828 </color >
48+ <color name =" design_dark_default_color_surface" >#141414 </color >
4949 <color name =" design_dark_default_color_on_surface" >#FFFFFF</color >
5050 <color name =" design_dark_default_color_error" >#C26C7A</color >
5151 <color name =" design_dark_default_color_on_error" >#000000</color >
Original file line number Diff line number Diff line change 8080 </item >
8181
8282 <!-- Elevation Overlays -->
83- <!-- TODO: Enable once more components support elevation overlays. -->
84- <item name =" elevationOverlaysEnabled" >false</item >
83+ <item name =" elevationOverlaysEnabled" >true</item >
8584 <item name =" elevationOverlaysColor" >?attr/colorOnSurface</item >
8685 </style >
8786
Original file line number Diff line number Diff line change 8080 </item >
8181
8282 <!-- Elevation Overlays -->
83- <!-- TODO: Enable once more components support elevation overlays. -->
84- <item name =" elevationOverlaysEnabled" >false</item >
83+ <item name =" elevationOverlaysEnabled" >true</item >
8584 <item name =" elevationOverlaysColor" >?attr/colorOnSurface</item >
8685 </style >
8786
187186 </item >
188187
189188 <!-- Elevation Overlays -->
190- <!-- TODO: Enable once more components support elevation overlays. -->
191- <item name =" elevationOverlaysEnabled" >false</item >
189+ <item name =" elevationOverlaysEnabled" >true</item >
192190 <item name =" elevationOverlaysColor" >?attr/colorOnSurface</item >
193191 </style >
194192
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ public class ElevationOverlayProviderTest {
4646
4747 @ Before
4848 public void initContextThemeWithElevationOverlays () {
49- context .setTheme (R .style .Test_Theme_MaterialComponents_ElevationOverlays );
49+ context .setTheme (R .style .Theme_MaterialComponents_NoActionBar );
5050 }
5151
5252 @ Test
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments