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

Commit 6184a397 authored by Ben Reich's avatar Ben Reich Committed by Android (Google) Code Review
Browse files

Merge "Ensure peek preview icon gets appropriate color" into main

parents 69c54cf6 48743985

res/flag(com.android.documentsui.flags.use_material3)/color/doc_list_item_badge_icon_color.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

  -->





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

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

    <item android:state_selected="true" android:color="?attr/colorOnPrimary" />

    <item android:state_selected="true" android:color="?attr/colorOnPrimaryContainer" />

    <item android:color="?attr/colorSecondary" />

    <item android:color="?attr/colorOnSurface" />

</selector>
 
</selector>

res/flag(com.android.documentsui.flags.use_material3)/drawable/ic_zoom_out.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -18,8 +18,12 @@ 
        android:height="24dp"

        android:height="24dp"

        android:viewportWidth="960"

        android:viewportWidth="960"

        android:viewportHeight="960">

        android:viewportHeight="960">

     <!--

          White is unused here, the actual color is supplied in

          doc_list_item_badge_icon_color as android:tint.

     -->

    <path

    <path

        android:fillColor="?attr/colorOnSurface"

        android:fillColor="@android:color/white"

        android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z" />

        android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z" />

</vector>

</vector>