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

Commit bcdb3f0c authored by lindatseng's avatar lindatseng Committed by Linda Tseng
Browse files

Add night variant of Theme.DeviceDefault.Settings.Dialog 

Add night variant of Theme.DeviceDefault.Settings.Dialog to support
panel in dark mode.  Also adding night variant here can ensure this
theme can reused by others.

Test: Manual
Fixes: 130815366
Change-Id: Idd8683a42dfb9dfffb8fc3f5a59c35a4a83a8de1
parent 2c570c17

core/res/res/values-night/themes_device_defaults.xml

+13 −0
Original line number Diff line number Diff line
@@ -62,6 +62,19 @@ easier. 
        <item name="listDivider">@color/list_divider_color_dark</item>

    </style>



    <style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.BaseDialog">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_dark_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

        <item name="colorError">@color/error_color_device_default_dark</item>

        <item name="colorBackground">@color/primary_dark_device_default_settings</item>



        <!-- Dialog attributes -->

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>

    </style>



    <!-- Theme for the dialog shown when an app crashes or ANRs. -->

    <style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="Theme.DeviceDefault.Dialog.Alert" />

core/res/res/values/themes_device_defaults.xml

+9 −5
Original line number Diff line number Diff line
@@ -1562,10 +1562,7 @@ easier. 
        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>

    </style>



    <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.Material.Settings.Dialog">

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>

        <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item>



    <style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.Light.BaseDialog">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
@@ -1574,8 +1571,15 @@ easier. 
        <item name="colorError">@color/error_color_device_default_light</item>



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>

    </style>



    <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.DeviceDefault.Settings.DialogBase">

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>

        <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item>



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>



        <!-- Text styles -->

        <item name="textAppearanceButton">@style/TextAppearance.DeviceDefault.Widget.Button</item>