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

Commit ca34ba4a authored by Ben Kwa's avatar Ben Kwa Committed by Android Git Automerger
Browse files

am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 

* commit '8dbb4328':
  Fix drawer selection to match Material spec.
parents 113e3fda 8dbb4328

packages/DocumentsUI/res/color/item_root_icon.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,5 @@ 
-->

-->





<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:color/primary_text_default_material_dark" />

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

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

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

</selector>
 
</selector>

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:color/primary_text_default_material_dark" />

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

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

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

    <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/drawable/item_root_background.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,10 +16,10 @@ 




<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">

    <item android:state_focused="true" android:state_activated="true">

        <color android:color="?android:attr/colorAccent" />

        <color android:color="@color/material_grey_300" />

    </item>

    </item>

    <item android:state_focused="false" android:state_activated="true">

    <item android:state_focused="false" android:state_activated="true">

        <color android:color="?android:attr/colorAccent" />

        <color android:color="@color/material_grey_300" />

    </item>

    </item>

    <item android:drawable="@android:color/transparent" />

    <item android:drawable="@android:color/transparent" />

</selector>
 
</selector>