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

Commit 564ae031 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2692-u-theme_fixes' into 'v1-u' 

Redo system theming

See merge request e/os/android_frameworks_base!233
parents 3a5168e3 8ae81242

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

+3 −0
Original line number Diff line number Diff line
@@ -20,4 +20,7 @@ 
    <color name="e_disabled_color">@color/e_disabled_color_dark</color>

    <color name="e_ripple_color">@color/e_ripple_color_dark</color>

    <color name="e_stroke_color">@color/e_stroke_color_dark</color>

    <color name="e_qs_background">@color/e_qs_background_dark</color>

    <color name="e_qs_tile_inactive">@color/e_qs_tile_inactive_dark</color>

    <color name="e_notification_background">@color/e_notification_background_dark</color>

</resources>
 
 No newline at end of file

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

+5 −3
Original line number Diff line number Diff line
@@ -22,13 +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">#2F3034</item>

        <item name="android:colorBackgroundFloating">@android:color/black</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

+73 −73

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/colors_device_defaults.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
    <color name="accent_tertiary_device_default">@color/system_accent3_100</color>



    <!-- Accent variants -->

    <color name="accent_primary_variant_light_device_default">@color/system_accent1_600</color>

    <color name="accent_primary_variant_light_device_default">@color/e_accent_light</color>

    <color name="accent_secondary_variant_light_device_default">@color/system_accent2_600</color>

    <color name="accent_tertiary_variant_light_device_default">@color/system_accent3_600</color>

    <color name="accent_primary_variant_dark_device_default">@color/system_accent1_300</color>

    <color name="accent_primary_variant_dark_device_default">@color/e_accent_dark</color>

    <color name="accent_secondary_variant_dark_device_default">@color/system_accent2_300</color>

    <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>

core/res/res/values/e_colors.xml

+9 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
    <color name="e_stroke_color_light">#1F000000</color>

    <color name="e_launcher_widget_background_light">#40202020</color>

    <color name="e_launcher_search_background_light">#94353535</color>

    <color name="e_qs_background_light">#F1F0F3</color>

    <color name="e_qs_tile_inactive_light">#DDDDE4</color>

    <color name="e_notification_background_light">@color/white</color>
@@ -43,6 +46,9 @@ 
    <color name="e_disabled_color_dark">#61FFFFFF</color>

    <color name="e_ripple_color_dark">#33FFFFFF</color>

    <color name="e_stroke_color_dark">#1FFFFFFF</color>

    <color name="e_qs_background_dark">@color/black</color>

    <color name="e_qs_tile_inactive_dark">#2F3034</color>

    <color name="e_notification_background_dark">#2F3034</color>





    <color name="e_accent">@color/e_accent_light</color>
@@ -67,8 +73,9 @@ 
    <color name="e_stroke_color">@color/e_stroke_color_light</color>

    <color name="e_launcher_widget_background">@color/e_launcher_widget_background_light</color>

    <color name="e_launcher_search_background">@color/e_launcher_search_background_light</color>





    <color name="e_qs_background">@color/e_qs_background_light</color>

    <color name="e_qs_tile_inactive">@color/e_qs_tile_inactive_light</color>

    <color name="e_notification_background">@color/e_notification_background_light</color>



    <color name="e_switch_thumb_on">@android:color/white</color>

    <color name="e_switch_thumb_off">@android:color/white</color>