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

Commit 13d4f143 authored by Linda Tseng's avatar Linda Tseng Committed by android-build-merger
Browse files

Merge "Add night variant of Theme.DeviceDefault.Settings.Dialog" into qt-dev am: 4d304d67 

am: 4dd4a639

Change-Id: I65f40ef698802b212900ac7797df9ab0437bbdfd
parents 6615d306 4dd4a639

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
@@ -1564,10 +1564,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>
@@ -1576,8 +1573,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>