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

Commit c3823f9d authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Rename the Theme.DeviceDefault.Settings.Dark to QuickSettings"

parents 13345d36 8c5a516e

core/res/res/values/themes_device_defaults.xml

+4 −4
Original line number Diff line number Diff line
@@ -742,15 +742,15 @@ easier. 
        <item name="colorAccent">@color/accent_device_default_light</item>

    </style>



    <!-- DeviceDefault theme for a window that should use Settings theme colors but has

         a full dark palette (instead of Light with dark action bar like

         Theme.DeviceDefault.Settings.  -->

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

    <!-- @hide DeviceDefault theme for a window that should use Settings theme colors

         but has a full dark palette. ONLY USED FOR QUICK SETTINGS THEME -->

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

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_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="colorControlNormal">?attr/textColorPrimary</item>

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->

packages/SystemUI/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ 
    <style name="Animation.StatusBar">

    </style>



    <style name="systemui_theme" parent="@*android:style/Theme.DeviceDefault.Settings.Dark" />

    <style name="systemui_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings" />



    <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:colorAccent">@color/remote_input_accent</item>
@@ -400,7 +400,7 @@ 
        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="edit_theme" parent="@*android:style/Theme.DeviceDefault.Settings.Dark">

    <style name="edit_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings">

        <item name="android:colorBackground">?android:attr/colorSecondary</item>

    </style>