Skip to content

Commit 760a99f

Browse files
dsn5ftikim24
authored andcommitted
Enable Elevation Overlays for Dark Themes and update surface colors to match spec
PiperOrigin-RevId: 240425682
1 parent 37a62a8 commit 760a99f

File tree

6 files changed

+5
-37
lines changed

6 files changed

+5
-37
lines changed

catalog/java/io/material/catalog/application/theme/res/values/themes.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,5 @@
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>

lib/java/com/google/android/material/color/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
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>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
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

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
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

@@ -187,8 +186,7 @@
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

lib/javatests/com/google/android/material/elevation/ElevationOverlayProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

lib/javatests/com/google/android/material/elevation/res/values/themes.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)