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

Commit 87598adb authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Add some themes to let Settings use DeviceDefault.\" into... 

Merge "Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev am: d46ae2f7" into nyc-mr1-dev-plus-aosp
parents 2ee4519a 12399cc4

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>