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

Commit acc96682 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change action bar text color back to accent."

parents ca006f9d f5d8a886

core/res/res/values/themes_device_defaults.xml

+13 −0
Original line number Original line Diff line number Diff line
@@ -735,6 +735,10 @@ easier. 




    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

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

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

        <!-- action bar -->

        <item name="actionBarTheme">@style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>

        <item name="popupTheme">@style/ThemeOverlay.DeviceDefault.Popup.Light</item>



        <!-- Color palette -->

        <!-- Color palette -->

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

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

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>
@@ -809,6 +813,15 @@ easier. 




    <style name="ThemeOverlay.DeviceDefault" />

    <style name="ThemeOverlay.DeviceDefault" />





    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for

             primary text -->

    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="ThemeOverlay.Material.ActionBar">

        <item name="textColorPrimary">@color/btn_colored_borderless_text_material</item>

    </style>



    <!-- @hide Theme overlay for a light popup in action bar -->

    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@style/ThemeOverlay.Material.Light" />



    <style name="ThemeOverlay.DeviceDefault.Accent">

    <style name="ThemeOverlay.DeviceDefault.Accent">

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

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

    </style>

    </style>