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

Commit 7bff6d6b authored by Nishith Khanna's avatar Nishith Khanna
Browse files

SystemUI: Theme according to our palette 

Theme quick settings to match our palette
Theme switches in various sub dialogs in quick settings
Theme screen record dialog
Theme internet dialog
Theme power menu
parent f6f6cd0a

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

+6 −1
Original line number Diff line number Diff line
@@ -22,10 +22,15 @@ 
        <item name="colorSecondary">@color/secondary_device_default_settings</item>

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

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

        <item name="colorSurfaceHeader">@color/surface_header_dark_sysui</item>

        <item name="colorSurfaceHeader">@color/e_qs_background_dark</item>

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

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

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

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

        <item name="colorSurface">@color/e_notification_background_dark</item>

        <item name="android:colorBackgroundFloating">@color/e_qs_background_dark</item>

        <item name="materialColorSurfaceDim">@color/e_qs_background_dark</item>

        <item name="materialColorSurfaceContainerHigh">@color/e_notification_background_dark</item>

    </style>



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

core/res/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ 
    <color name="system_surface_container_light">#EFEDF1</color>

    <color name="system_surface_container_high_light">#E9E7EC</color>

    <color name="system_surface_container_highest_light">#E3E2E6</color>

    <color name="system_surface_bright_light">#FAF9FD</color>

    <color name="system_surface_bright_light">@color/e_floating_background_light</color>

    <color name="system_surface_dim_light">#DBD9DD</color>

    <color name="system_surface_variant_light">#E1E2EC</color>

    <color name="system_on_surface_variant_light">#44474F</color>
@@ -557,7 +557,7 @@ 
    <color name="system_surface_container_dark">#1F1F23</color>

    <color name="system_surface_container_high_dark">#292A2D</color>

    <color name="system_surface_container_highest_dark">#343538</color>

    <color name="system_surface_bright_dark">#38393C</color>

    <color name="system_surface_bright_dark">@color/e_floating_background_dark</color>

    <color name="system_surface_dim_dark">#121316</color>

    <color name="system_surface_variant_dark">#44474F</color>

    <color name="system_on_surface_variant_dark">#C4C6D0</color>

core/res/res/values/themes_device_defaults.xml

+10 −9
Original line number Diff line number Diff line
@@ -4164,16 +4164,16 @@ easier. 
        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>

        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>

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

        <item name="colorAccentPrimary">@color/accent_primary_device_default</item>

        <item name="colorAccentSecondary">@color/accent_secondary_device_default</item>

        <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item>

        <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item>

        <item name="colorAccentPrimary">@color/accent_device_default</item>

        <item name="colorAccentSecondary">@color/accent_device_default</item>

        <item name="colorAccentTertiary">@color/accent_device_default</item>

        <item name="colorAccentPrimaryVariant">@color/accent_device_default</item>

        <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item>

        <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item>

        <item name="colorSurface">@color/surface_light</item>

        <item name="colorSurface">@color/e_notification_background_light</item>

        <item name="colorSurfaceHighlight">@color/surface_highlight_light</item>

        <item name="colorSurfaceVariant">@color/surface_variant_light</item>

        <item name="colorSurfaceHeader">@color/surface_header_light</item>

        <item name="colorSurfaceHeader">@color/e_qs_background_light</item>

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

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

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>
@@ -4191,6 +4191,7 @@ easier. 


        <!-- Toolbar attributes -->

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

        <item name="android:colorBackgroundFloating">@color/e_qs_background_light</item>



        <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>

        <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
@@ -4222,11 +4223,11 @@ easier. 


        <item name="materialColorOnSecondary">@color/system_on_secondary_light</item>

        <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>

        <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>

        <item name="materialColorSurfaceDim">@color/e_qs_background_light</item>

        <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>

        <item name="materialColorOnError">@color/system_on_error_light</item>

        <item name="materialColorSurface">@color/system_surface_light</item>

        <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>

        <item name="materialColorSurfaceContainerHigh">@color/e_notification_background_light</item>

        <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>

        <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>

        <item name="materialColorOutline">@color/system_outline_light</item>
@@ -4234,7 +4235,7 @@ easier. 
        <item name="materialColorOnPrimary">@color/system_on_primary_light</item>

        <item name="materialColorOnSurface">@color/system_on_surface_light</item>

        <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>

        <item name="materialColorPrimary">@color/system_primary_light</item>

        <item name="materialColorPrimary">@color/e_accent</item>

        <item name="materialColorSecondary">@color/system_secondary_light</item>

        <item name="materialColorTertiary">@color/system_tertiary_light</item>

        <item name="materialColorError">@color/system_error_light</item>

packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/materialColorSecondaryFixedDim"/>

    <item android:color="@*android:color/e_accent"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:color="?attr/wallpaperTextColorSecondary">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="?androidprv:attr/materialColorTertiaryFixed"/>

            <solid android:color="@*android:color/e_accent"/>

            <corners android:radius="24dp"/>

        </shape>

    </item>