diff options
| author | 2024-10-02 10:44:09 +0000 | |
|---|---|---|
| committer | 2024-10-02 10:44:09 +0000 | |
| commit | 59a5adf103a0de8f1fdfd8a6ee4d43eec593b07a (patch) | |
| tree | 6a7c9d1641e262793a6100b61d9e63da7fa203dc | |
| parent | 5f079c58fc5755ca75c533ff0db7a69466c6401a (diff) | |
| parent | e1e326ec03479be4c738f8438610bbbfd1900a6a (diff) | |
Merge "[Contextual Edu] Show dialog with correct theme in light and dark modes" into main
| -rw-r--r-- | packages/SystemUI/res/values-night/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml index e9dd039f38c2..7bd4ca8b940b 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -64,4 +64,9 @@ <item name="android:windowLightNavigationBar">false</item> </style> + <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> + <!-- To make the dialog wrap to content when the education text is short --> + <item name="windowMinWidthMajor">0%</item> + <item name="windowMinWidthMinor">0%</item> + </style> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index b34d6e4067b6..1c09f84b6fd0 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -1721,7 +1721,7 @@ <item name="android:windowLightNavigationBar">true</item> </style> - <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> + <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> <!-- To make the dialog wrap to content when the education text is short --> <item name="windowMinWidthMajor">0%</item> <item name="windowMinWidthMinor">0%</item> |