Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59a5adf1 authored by Helen Cheuk's avatar Helen Cheuk Committed by Android (Google) Code Review
Browse files

Merge "[Contextual Edu] Show dialog with correct theme in light and dark modes" into main

parents 5f079c58 e1e326ec

packages/SystemUI/res/values-night/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>