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

Commit 12399cc4 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev 

am: d46ae2f7

Change-Id: I0c969751879f4e7b168fcfac4331cefe45089512
parents f40e62e3 d46ae2f7

core/res/res/values/themes_device_defaults.xml

+18 −0
Original line number Diff line number Diff line
@@ -733,6 +733,20 @@ easier. 
        <item name="colorAccent">@color/accent_device_default_light</item>

    </style>



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

        <!-- Color palette -->

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

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

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

    </style>



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

        <!-- Color palette -->

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

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

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

    </style>



    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">

        <item name="windowIsTranslucent">true</item>
@@ -764,4 +778,8 @@ easier. 
        <item name="colorAccent">@color/accent_device_default_light</item>

    </style>



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

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

    </style>



</resources>