Skip to content

Commit 81d1b77

Browse files
pubiqqpaulfthomas
authored andcommittedNov 6, 2023
[Theme] Add NoActionBar dynamic color themes
Resolves #3636 GIT_ORIGIN_REV_ID=ab4463028a14e4d4fbd3a613c4c402b8de39f552 PiperOrigin-RevId: 578900644
1 parent 7674e12 commit 81d1b77

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed
 

‎docs/getting-started.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,22 @@ Here are the `Material3` themes you can use to get the latest component styles
137137
and theme-level attributes, as well as their `MaterialComponents` equivalents
138138
when applicable.
139139
140-
`Material3` | `MaterialComponents`
141-
-------------------------------------- | --------------------
142-
`Theme.Material3.Light` | `Theme.MaterialComponents.Light`
143-
`Theme.Material3.Light.NoActionBar` | `Theme.MaterialComponents.Light.NoActionBar`
144-
`Theme.Material3.Dark` | `Theme.MaterialComponents`
145-
`Theme.Material3.Dark.NoActionBar` | `Theme.MaterialComponents.NoActionBar`
146-
`Theme.Material3.DayNight` | `Theme.MaterialComponents.DayNight`
147-
`Theme.Material3.DayNight.NoActionBar` | `Theme.MaterialComponents.DayNight.NoActionBar`
148-
N/A | `Theme.MaterialComponents.Light.DarkActionBar`
149-
N/A | `Theme.MaterialComponents.DayNight.DarkActionBar`
140+
| `Material3` | `MaterialComponents` |
141+
|------------------------------------------------------|---------------------------------------------------|
142+
| `Theme.Material3.Light` | `Theme.MaterialComponents.Light` |
143+
| `Theme.Material3.Light.NoActionBar` | `Theme.MaterialComponents.Light.NoActionBar` |
144+
| `Theme.Material3.Dark` | `Theme.MaterialComponents` |
145+
| `Theme.Material3.Dark.NoActionBar` | `Theme.MaterialComponents.NoActionBar` |
146+
| `Theme.Material3.DayNight` | `Theme.MaterialComponents.DayNight` |
147+
| `Theme.Material3.DayNight.NoActionBar` | `Theme.MaterialComponents.DayNight.NoActionBar` |
148+
| `Theme.Material3.DynamicColors.Light` | N/A |
149+
| `Theme.Material3.DynamicColors.Light.NoActionBar` | N/A |
150+
| `Theme.Material3.DynamicColors.Dark` | N/A |
151+
| `Theme.Material3.DynamicColors.Dark.NoActionBar` | N/A |
152+
| `Theme.Material3.DynamicColors.DayNight` | N/A |
153+
| `Theme.Material3.DynamicColors.DayNight.NoActionBar` | N/A |
154+
| N/A | `Theme.MaterialComponents.Light.DarkActionBar` |
155+
| N/A | `Theme.MaterialComponents.DayNight.DarkActionBar` |
150156
151157
Update your app theme to inherit from one of these themes:
152158

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

+3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
<public name="Theme.Material3.DayNight" type="style"/>
2323
<public name="Theme.Material3.DayNight.NoActionBar" type="style"/>
2424
<public name="Theme.Material3.DynamicColors.Light" type="style"/>
25+
<public name="Theme.Material3.DynamicColors.Light.NoActionBar" type="style"/>
2526
<public name="Theme.Material3.DynamicColors.Dark" type="style"/>
27+
<public name="Theme.Material3.DynamicColors.Dark.NoActionBar" type="style"/>
2628
<public name="Theme.Material3.DynamicColors.DayNight" type="style"/>
29+
<public name="Theme.Material3.DynamicColors.DayNight.NoActionBar" type="style"/>
2730
<public name="Theme.Material3.Light.DialogWhenLarge" type="style"/>
2831
<public name="Theme.Material3.Dark.DialogWhenLarge" type="style"/>
2932
<public name="Theme.Material3.DayNight.DialogWhenLarge" type="style"/>

‎lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<style name="Theme.Material3.DayNight" parent="Theme.Material3.Dark"/>
2020
<style name="Theme.Material3.DayNight.NoActionBar" parent="Theme.Material3.Dark.NoActionBar"/>
2121
<style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Dark"/>
22+
<style name="Theme.Material3.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3.DynamicColors.Dark.NoActionBar"/>
2223
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Dark.DialogWhenLarge"/>
2324

2425
<!-- Material themes (day/night versions) for activities. -->

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

+10
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@
4444

4545
<style name="Theme.Material3.DynamicColors.Dark" parent="Theme.Material3.Dark"/>
4646

47+
<style name="Theme.Material3.DynamicColors.Light.NoActionBar">
48+
<item name="windowActionBar">false</item>
49+
<item name="windowNoTitle">true</item>
50+
</style>
51+
52+
<style name="Theme.Material3.DynamicColors.Dark.NoActionBar">
53+
<item name="windowActionBar">false</item>
54+
<item name="windowNoTitle">true</item>
55+
</style>
56+
4757
<style name="Theme.Material3.Light.DialogWhenLarge" parent="Base.Theme.Material3.Light.DialogWhenLarge"/>
4858

4959
<style name="Theme.Material3.Dark.DialogWhenLarge" parent="Base.Theme.Material3.Dark.DialogWhenLarge"/>

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

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<style name="Theme.Material3.DayNight" parent="Theme.Material3.Light"/>
2020
<style name="Theme.Material3.DayNight.NoActionBar" parent="Theme.Material3.Light.NoActionBar"/>
2121
<style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Light"/>
22+
<style name="Theme.Material3.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3.DynamicColors.Light.NoActionBar"/>
2223
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Light.DialogWhenLarge"/>
2324

2425
<!-- Material themes (day/night versions) for activities. -->

0 commit comments

Comments
 (0)
Please sign in to comment.