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

Commit 50c8d49d authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Make the activated root color darker in DocumentsUI for better a11y." into nyc-dev

parents b52a874f 588d6934

packages/DocumentsUI/res/color/item_root_primary_text.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 
-->

-->





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

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

    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorAccent" />

  <item android:state_focused="true" android:state_activated="true" android:color="@color/root_activated_color" />

    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorAccent" />

  <item android:state_focused="false" android:state_activated="true" android:color="@color/root_activated_color" />

    <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@*android:color/primary_text_default_material_light" />

    <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@*android:color/primary_text_default_material_light" />

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

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

</selector>
 
</selector>

packages/DocumentsUI/res/values/colors.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




<resources>

<resources>

    <color name="material_grey_400">#ffbdbdbd</color>

    <color name="material_grey_400">#ffbdbdbd</color>

    <color name="material_teal_700">#ff00796b</color>





    <!-- This is the window background, but also the background for anything

    <!-- This is the window background, but also the background for anything

         else that needs to manually declare a background matching the "default"

         else that needs to manually declare a background matching the "default"
@@ -36,6 +37,8 @@ 




    <color name="item_doc_background_disabled">#fff4f4f4</color>

    <color name="item_doc_background_disabled">#fff4f4f4</color>





    <color name="root_activated_color">@color/material_teal_700</color>



    <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->

    <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->

    <color name="item_doc_background">#fffafafa</color>

    <color name="item_doc_background">#fffafafa</color>

    <color name="item_doc_background_selected">#ffe0f2f1</color>

    <color name="item_doc_background_selected">#ffe0f2f1</color>