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

Commit e3bc1c43 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Adjust colors for accessibility" into sc-dev am: b3e682c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13479685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0407c33056b4565a896b5c1aa25c4e1ae9b228d8
parents a7012f1e b3e682c7

core/res/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ 
    <color name="system_main_400">#909090</color>

    <!-- Shade of the main system color at 50% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_main_500">#777777</color>

    <color name="system_main_500">#757575</color>

    <!-- Shade of the main system color at 40% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_main_600">#5e5e5e</color>
@@ -292,7 +292,7 @@ 
    <color name="system_accent_400">#1fa293</color>

    <!-- Shade of the accent system color at 50% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent_500">#00877a</color>

    <color name="system_accent_500">#008377</color>

    <!-- Shade of the accent system color at 40% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent_600">#006d61</color>

core/res/res/values/colors_device_defaults.xml

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ 
    <color name="background_floating_device_default_dark">@color/system_main_900</color>

    <color name="background_floating_device_default_light">@color/system_main_100</color>



    <color name="text_color_primary_device_default_light">@color/system_main_900</color>

    <color name="text_color_primary_device_default_dark">@color/system_main_50</color>

    <color name="text_color_secondary_device_default_light">@color/system_main_700</color>

    <color name="text_color_secondary_device_default_dark">@color/system_main_200</color>

    <color name="text_color_tertiary_device_default_light">@color/system_main_500</color>

    <color name="text_color_tertiary_device_default_dark">@color/system_main_400</color>



    <!-- Error color -->

    <color name="error_color_device_default_dark">@color/error_color_material_dark</color>

    <color name="error_color_device_default_light">@color/error_color_material_light</color>

core/res/res/values/themes_device_defaults.xml

+129 −0

File changed.

Preview size limit exceeded, changes collapsed.