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

Commit 14ae4027 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Correcting color for Toolbar; reverting partially of ag/1585189." into nyc-andromeda-dev

parents d43524b2 536caed6

res/color/item_title.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_enabled="true"

        android:color="?android:attr/textColorPrimary" />

        android:color="@color/item_doc_title" />

    <item

        android:state_enabled="false"

        android:color="@*android:color/secondary_text_default_material_light"/>

res/layout/item_subdir.xml

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
        android:singleLine="true"

        android:ellipsize="end"

        android:textAlignment="viewStart"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

        android:textColor="@*android:color/primary_text_default_material_light" />

        android:textColor="@color/item_doc_title" />



</LinearLayout>

res/layout/item_subdir_title.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,5 +30,5 @@ 
        android:textAlignment="viewStart"

        android:drawablePadding="12dp"

        android:drawableRight="@drawable/ic_breadcrumb_arrow_down"

        android:textColor="?android:attr/textColorPrimary" />

        android:textColor="@color/item_doc_title" />

</LinearLayout>

res/values/colors.xml

+3 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <color name="menu_search_background">@android:color/transparent</color>



    <color name="primary_dark">@*android:color/primary_dark_device_default_settings</color>

    <color name="primary">@*android:color/primary_text_default_material_light</color>

    <color name="primary">@*android:color/primary_device_default_settings</color>

    <color name="accent">@*android:color/accent_device_default_light</color>

    <color name="accent_dark">@*android:color/accent_device_default_dark</color>
@@ -34,7 +34,8 @@ 
    <color name="root_activated_color">@*android:color/accent_device_default_700</color>



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

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

    <color name="item_doc_title">@*android:color/primary_text_default_material_light</color>

    <color name="item_doc_background">@*android:color/white</color>

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

    <color name="item_doc_background_selected">@*android:color/accent_device_default_50</color>

    <color name="item_breadcrumb_background_hovered">#1affffff</color>