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

Commit 0782134b authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Update root icons 

This is a preparation to remove icon overrides in desktop RRO.

Previously these icons are overwritten in the RRO, in order to
remove the unnecessary RRO icon overrides, this CL updates the
icons to the latest ones from the Material icons.

Check the attached bug for demo.

Bug: 405236942
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: I6ecc68cb176896c9d96c9083a53e8d8ed6934345
parent 8c8925a2

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

+8 −7
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ Copyright (C) 2024 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:viewportWidth="960"

    android:viewportHeight="960">

    <!-- fillColor will be set by tint color in the code. -->

    <path

        android:fillColor="#5F6368"

        android:pathData="M5 17h14v2H5zm7-12L5.33 15h13.34z"/>

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

        android:pathData="M200,760L200,680L760,680L760,760L200,760ZM214,600L480,200L746,600L214,600ZM480,520L480,520L480,520ZM362,520L598,520L480,344L362,520Z"/>

</vector>

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

+8 −6
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportHeight="24"

        android:viewportWidth="24">

    android:viewportWidth="960"

    android:viewportHeight="960">

    <!-- fillColor will be set by tint color in the code. -->

    <path

        android:fillColor="#5F6368"

        android:pathData="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />

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

        android:pathData="M480,640L280,440L336,382L440,486L440,160L520,160L520,486L624,382L680,440L480,640ZM240,800Q207,800 183.5,776.5Q160,753 160,720L160,600L240,600L240,720Q240,720 240,720Q240,720 240,720L720,720Q720,720 720,720Q720,720 720,720L720,600L800,600L800,720Q800,753 776.5,776.5Q753,800 720,800L240,800Z"/>

</vector>

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

+8 −6
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ Copyright (C) 2024 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:viewportWidth="960"

    android:viewportHeight="960">

    <!-- fillColor will be set by tint color in the code. -->

    <path

        android:fillColor="#5F6368"

        android:pathData="M17 1.01L7 1c-1.1 0,-2 .9,-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2,-.9 2,-2V3c0,-1.1,-.9,-1.99,-2,-1.99zM17 19H7V5h10v14z"/>

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

        android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z"/>

</vector>

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

+8 −6
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ Copyright (C) 2024 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:viewportWidth="960"

    android:viewportHeight="960">

    <!-- fillColor will be set by tint color in the code. -->

    <path

        android:fillColor="#5F6368"

        android:pathData="M18 2h-8L4.02 8 4 20c0 1.1.9 2 2 2h12c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z"/>

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

        android:pathData="M360,440L440,440L440,280L360,280L360,440ZM480,440L560,440L560,280L480,280L480,440ZM600,440L680,440L680,280L600,280L600,440ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,320L400,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,160Q720,160 720,160Q720,160 720,160L434,160L240,354L240,800Q240,800 240,800Q240,800 240,800ZM240,800Q240,800 240,800Q240,800 240,800L240,800L434,800L720,800Q720,800 720,800Q720,800 720,800L720,800Q720,800 720,800Q720,800 720,800L240,800Z"/>

</vector>

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

+8 −6
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ Copyright (C) 2024 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:viewportWidth="960"

    android:viewportHeight="960">

    <!-- fillColor will be set by tint color in the code. -->

    <path

        android:fillColor="?android:textColorSecondary"

        android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>

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

        android:pathData="M480,880Q447,880 423.5,856.5Q400,833 400,800Q400,779 411,761Q422,743 440,732L440,640L320,640Q287,640 263.5,616.5Q240,593 240,560L240,468Q222,459 211,441Q200,423 200,400Q200,367 223.5,343.5Q247,320 280,320Q313,320 336.5,343.5Q360,367 360,400Q360,423 349,440Q338,457 320,468L320,560Q320,560 320,560Q320,560 320,560L440,560L440,240L360,240L480,80L600,240L520,240L520,560L640,560Q640,560 640,560Q640,560 640,560L640,480L600,480L600,320L760,320L760,480L720,480L720,560Q720,593 696.5,616.5Q673,640 640,640L520,640L520,732Q539,742 549.5,760Q560,778 560,800Q560,833 536.5,856.5Q513,880 480,880Z"/>

</vector>