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

Commit 41b02707 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] update color for unit bar 

* Update background color for the unit bar sort icon.
* Add ripple effect for the sort icon.
* Remove focus+hover state as per spec.

Check the attached bug for the demo.

Bug: 409697194
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: I6d38e6660f35977693ae12b8af3d297d6e3060fd
parent 38323b82

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

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2025 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

  -->



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

    <item android:alpha="@dimen/ripple_overlay_alpha" android:color="?attr/colorOnSurface"/>

</selector>

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -15,12 +15,12 @@ 
    limitations under the License.

    limitations under the License.

  -->

  -->

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

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

    android:width="28dp"

    android:width="20dp"

    android:height="32dp"

    android:height="20dp"

    android:viewportHeight="32"

    android:viewportWidth="960"

    android:viewportWidth="28">

    android:viewportHeight="960"



    android:tint="?attr/colorOnSurface">

    <path

    <path

        android:fillColor="?attr/colorOnSecondaryContainer"

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

        android:pathData="M13.25 19.125V10.75c0-.208.07-.382.208-.52A.74.74 0 0 1 14 10c.208 0 .382.076.52.23.154.138.23.312.23.52v8.375l3.667-3.667a.718.718 0 0 1 .52-.229c.209 0 .39.077.542.23.153.152.23.333.23.541a.718.718 0 0 1-.23.52l-4.958 4.96a.786.786 0 0 1-.25.166.85.85 0 0 1-.271.041c-.097 0-.194-.013-.292-.041a.878.878 0 0 1-.229-.167l-4.958-4.958A.718.718 0 0 1 8.29 16a.822.822 0 0 1 .25-.542.718.718 0 0 1 .521-.229.74.74 0 0 1 .542.23l3.646 3.666Z" />

        android:pathData="M444,630L444,227.98Q444,212.69 454.29,202.34Q464.58,192 479.79,192Q495,192 505.5,202.34Q516,212.69 516,227.98L516,630L692.21,453.79Q703,443 717.5,443Q732,443 743.48,454Q754,465 754,479.5Q754,494 743.18,504.81L505.09,742.6Q499.68,748 493.37,750.5Q487.06,753 479.84,753Q472.63,753 466.31,750.5Q460,748 455,743L217,505Q206,494 206.5,479.5Q207,465 217.52,454Q229,443 243.67,443Q258.33,443 269,454L444,630Z"/>

</vector>
 
</vector>
 
 No newline at end of file

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->

  -->





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

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

        android:drawable="@drawable/ic_sort_icon"

        android:drawable="@drawable/ic_arrow_upward"

        android:fromDegrees="0"

        android:fromDegrees="0"

        android:toDegrees="180"

        android:toDegrees="180"

        android:pivotX="50%"

        android:pivotX="50%"

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

deleted100644 → 0
+0 −98
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2024 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

  -->

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

    <item

        android:state_focused="true"

        android:state_hovered="true">

        <layer-list>

            <item>

                <shape

                    android:background="?attr/colorSurfaceBright"

                    android:shape="rectangle"

                    android:tint="?attr/colorSecondaryContainer"

                    android:tintMode="multiply">

                    <corners android:radius="14dp" />

                    <size

                        android:width="28dp"

                        android:height="32dp" />

                    <solid android:color="?attr/colorSecondaryContainer" />

                    <stroke

                        android:width="@dimen/focus_ring_width"

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

                </shape>

            </item>

            <item android:drawable="@drawable/ic_arrow_upward" />

        </layer-list>

    </item>

    <item

        android:state_focused="false"

        android:state_hovered="true">

        <layer-list>

            <item>

                <shape

                    android:background="?attr/colorSurfaceBright"

                    android:shape="rectangle"

                    android:tint="?attr/colorSecondaryContainer"

                    android:tintMode="multiply">

                    <corners android:radius="14dp" />

                    <size

                        android:width="28dp"

                        android:height="32dp" />

                    <solid android:color="?attr/colorSecondaryContainer" />

                </shape>

            </item>

            <item android:drawable="@drawable/ic_arrow_upward" />

        </layer-list>

    </item>

    <item

        android:state_focused="true"

        android:state_hovered="false">

        <layer-list>

            <item>

                <shape

                    android:background="?attr/colorSurfaceBright"

                    android:shape="rectangle">

                    <corners android:radius="14dp" />

                    <size

                        android:width="28dp"

                        android:height="32dp" />

                    <solid android:color="?attr/colorSecondaryContainer" />

                    <stroke

                        android:width="@dimen/focus_ring_width"

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

                </shape>

            </item>

            <item android:drawable="@drawable/ic_arrow_upward" />

        </layer-list>

    </item>

    <item>

        <layer-list>

            <item>

                <shape

                    android:background="?attr/colorSurfaceBright"

                    android:shape="rectangle">

                    <corners android:radius="14dp" />

                    <size

                        android:width="28dp"

                        android:height="32dp" />

                    <solid android:color="?attr/colorSecondaryContainer" />

                </shape>

            </item>

            <item android:drawable="@drawable/ic_arrow_upward" />

        </layer-list>

    </item>

</selector>
 
 No newline at end of file

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

0 → 100644
+73 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2025 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

  -->



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

    android:color="@color/sort_icon_ripple_color">



    <item android:id="@android:id/mask">

        <shape>

            <corners android:radius="@dimen/doc_header_sort_icon_radius" />

            <!-- The color here doesn't matter, it's just being used as a mask. -->

            <solid android:color="@android:color/white" />

        </shape>

    </item>



    <item>

        <selector>

            <item android:state_focused="true">

                <layer-list>

                    <item>

                        <shape>

                            <corners android:radius="@dimen/doc_header_sort_icon_radius" />

                            <solid android:color="?attr/colorSurfaceDim" />

                        </shape>

                    </item>

                    <item>

                        <shape>

                            <corners android:radius="@dimen/doc_header_sort_icon_radius" />

                            <stroke

                                android:width="@dimen/focus_ring_width"

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

                        </shape>

                    </item>

                </layer-list>

            </item>

            <item android:state_hovered="true">

                <layer-list>

                    <item>

                        <shape>

                            <corners android:radius="@dimen/doc_header_sort_icon_radius" />

                            <solid android:color="?attr/colorSurfaceDim" />

                        </shape>

                    </item>

                    <item>

                        <shape android:tint="@color/overlay_hover_color_percentage">

                            <corners android:radius="@dimen/doc_header_sort_icon_radius" />

                            <solid android:color="?attr/colorSurfaceDim" />

                        </shape>

                    </item>

                </layer-list>

            </item>

            <item>

                <shape>

                    <corners android:radius="@dimen/doc_header_sort_icon_radius" />

                    <solid android:color="?attr/colorSurfaceDim" />

                </shape>

            </item>

        </selector>

    </item>

</ripple>
 
 No newline at end of file