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

Commit 68a3422b authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "5/N The road to Material NEXT (background color)"

parents 5bcadd3c 6cb5348d

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

+1 −7
Original line number Diff line number Diff line
@@ -25,18 +25,12 @@ 
        <item name="colorControlNormal">?attr/textColorPrimary</item>

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

        <item name="forceDarkAllowed">false</item>



        <!-- QS panel background -->

        <item name="colorBackgroundFloating">@color/black</item>



        <!-- volume background -->

        <item name="panelColorBackground">@color/material_grey_800</item>

    </style>



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



    <style name="TextAppearance.Material.Notification">

        <item name="textColor">@color/notification_secondary_text_color_dark</item>

        <item name="textColor">?attr/textColorPrimary</item>

        <item name="textSize">@dimen/notification_text_size</item>

    </style>

</resources>
 
 No newline at end of file

core/res/res/values/themes_device_defaults.xml

+4 −3
Original line number Diff line number Diff line
@@ -215,8 +215,10 @@ easier. 
        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

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

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

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

        <item name="colorPopupBackground">?attr/colorBackgroundFloating</item>

        <item name="panelColorBackground">?attr/colorBackgroundFloating</item>

    </style>



    <style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" />
@@ -943,8 +945,10 @@ easier. 
        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

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

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

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>

        <item name="colorPopupBackground">?attr/colorBackgroundFloating</item>

        <item name="panelColorBackground">?attr/colorBackgroundFloating</item>

    </style>



    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
@@ -1517,9 +1521,6 @@ easier. 


        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>



        <!-- volume background -->

        <item name="panelColorBackground">@color/primary_material_light</item>

    </style>



    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog">