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

Commit 2e15b59c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Uplift hover state in grid" into main

parents 01f04df9 46027413

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

+83 −0
Original line number Diff line number Diff line
@@ -16,6 +16,41 @@ 


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

    <!-- selected -->

    <item

        android:state_focused="true"

        android:state_hovered="true"

        android:state_selected="true">

        <layer-list>

            <item

                android:bottom="@dimen/focus_ring_gap"

                android:left="@dimen/focus_ring_gap"

                android:right="@dimen/focus_ring_gap"

                android:top="@dimen/focus_ring_gap">

                <shape>

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

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

                </shape>

            </item>

            <item

                android:bottom="@dimen/focus_ring_gap"

                android:left="@dimen/focus_ring_gap"

                android:right="@dimen/focus_ring_gap"

                android:top="@dimen/focus_ring_gap">

                <shape android:tint="?attr/colorOnPrimaryContainer">

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

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

                </shape>

            </item>

            <item>

                <shape>

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

                    <stroke

                        android:width="@dimen/focus_ring_width"

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

                </shape>

            </item>

        </layer-list>

    </item>

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

        <layer-list>

            <item
@@ -38,6 +73,24 @@ 
            </item>

        </layer-list>

    </item>

    <item

        android:state_hovered="true"

        android:state_selected="true">

        <layer-list>

            <item>

                <shape>

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

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

                </shape>

            </item>

            <item>

                <shape android:tint="?attr/colorOnPrimaryContainer">

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

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

                </shape>

            </item>

        </layer-list>

    </item>

    <item android:state_selected="true">

        <shape>

            <corners android:radius="@dimen/grid_item_nameplate_radius" />
@@ -46,6 +99,30 @@ 
    </item>



    <!-- unselected -->

    <item

        android:state_focused="true"

        android:state_hovered="true">

        <layer-list>

            <item

                android:bottom="@dimen/focus_ring_gap"

                android:left="@dimen/focus_ring_gap"

                android:right="@dimen/focus_ring_gap"

                android:top="@dimen/focus_ring_gap">

                <shape android:tint="?attr/colorOnSurface">

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

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

                </shape>

            </item>

            <item>

                <shape>

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

                    <stroke

                        android:width="@dimen/focus_ring_width"

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

                </shape>

            </item>

        </layer-list>

    </item>

    <item android:state_focused="true">

        <shape>

            <corners android:radius="@dimen/grid_item_nameplate_radius" />
@@ -54,4 +131,10 @@ 
                android:color="?attr/colorSecondary" />

        </shape>

    </item>

    <item android:state_hovered="true">

        <shape android:tint="?attr/colorOnSurface">

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

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

        </shape>

    </item>

</selector>
 
 No newline at end of file