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

Commit deea7e16 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Update drag badge colors 

* Use different colors for copy symbol and reject symbol.
* Update static colors for SDK 30.

Bug: 408883935
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: Idb67e96ebf12473a82784d6770e702d38c6fe4a7
parent c8e5a9da

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

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ Copyright (C) 2024 The Android Open Source Project 
    android:viewportHeight="14">

    <path

        android:pathData="M7,0L7,0A7,7 0,0 1,14 7L14,7A7,7 0,0 1,7 14L7,14A7,7 0,0 1,0 7L0,7A7,7 0,0 1,7 0z"

        android:fillColor="@color/drop_icon_copy_container_background"/>

        android:fillColor="@color/success"/>

    <group>

        <clip-path

            android:pathData="M1,1h12v12h-12z"/>

        <path

            android:pathData="M6.387,11.438V7.613H2.563V6.387H6.387V2.563H7.613V6.387H11.438V7.613H7.613V11.438H6.387Z"

            android:fillColor="@color/drop_icon_symbol_color"/>

            android:fillColor="@color/on_success"/>

    </group>

</vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ Copyright (C) 2024 The Android Open Source Project 
            android:pathData="M1,1h12v12h-12z"/>

        <path

            android:pathData="M7,12.038C6.308,12.038 5.654,11.908 5.037,11.65C4.429,11.383 3.896,11.021 3.438,10.563C2.979,10.096 2.617,9.558 2.35,8.95C2.092,8.333 1.962,7.679 1.962,6.988C1.962,6.287 2.092,5.637 2.35,5.037C2.617,4.429 2.979,3.896 3.438,3.438C3.896,2.979 4.429,2.621 5.037,2.362C5.654,2.096 6.308,1.962 7,1.962C7.7,1.962 8.354,2.096 8.962,2.362C9.571,2.621 10.104,2.979 10.563,3.438C11.021,3.896 11.379,4.429 11.637,5.037C11.904,5.637 12.038,6.287 12.038,6.988C12.038,7.679 11.904,8.333 11.637,8.95C11.379,9.558 11.021,10.096 10.563,10.563C10.104,11.021 9.571,11.383 8.962,11.65C8.354,11.908 7.7,12.038 7,12.038ZM7,10.813C7.417,10.813 7.817,10.75 8.2,10.625C8.583,10.5 8.925,10.317 9.225,10.075L3.912,4.762C3.679,5.079 3.5,5.425 3.375,5.8C3.25,6.175 3.188,6.571 3.188,6.988C3.188,8.046 3.558,8.95 4.3,9.7C5.042,10.442 5.942,10.813 7,10.813ZM10.087,9.212C10.321,8.896 10.5,8.55 10.625,8.175C10.75,7.8 10.813,7.404 10.813,6.988C10.813,5.929 10.442,5.033 9.7,4.3C8.958,3.558 8.058,3.188 7,3.188C6.583,3.188 6.188,3.25 5.813,3.375C5.446,3.492 5.104,3.662 4.787,3.888L10.087,9.212Z"

            android:fillColor="@color/drop_icon_symbol_color"/>

            android:fillColor="@color/drop_icon_reject_symbol_color"/>

    </group>

</vector>

res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
  <!-- ?attr/colorOnSurface -->

  <color name="drag_content_text_color">@android:color/system_neutral1_100</color>

  <!-- ?attr/colorOnError -->

  <color name="drop_icon_symbol_color">@color/m3_ref_palette_error20</color>

  <color name="drop_icon_reject_symbol_color">@color/m3_ref_palette_error20</color>

  <!-- ?attr/colorError -->

  <color name="drop_icon_reject_container_background">@color/m3_ref_palette_error80</color>

</resources>

res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -38,6 +38,4 @@ 


    <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->

    <color name="search_chip_text_selected_color">@android:color/black</color>



    <color name="job_progress_success">#3CBA5A</color>

</resources>

res/flag(com.android.documentsui.flags.use_material3)/values-v31/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
  <!-- ?attr/colorOnSurface -->

  <color name="drag_content_text_color">@android:color/system_neutral1_900</color>

  <!-- ?attr/colorOnError -->

  <color name="drop_icon_symbol_color">@android:color/white</color>

  <color name="drop_icon_reject_symbol_color">@android:color/white</color>

  <!-- ?attr/colorError -->

  <color name="drop_icon_reject_container_background">@color/m3_ref_palette_error40</color>

</resources>