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

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

Merge "[DocsUI M3] Uplift hover and focused state for grid item thumbnail" into main

parents af353b0f ee730b53

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

+29 −0
Original line number Diff line number Diff line
@@ -15,10 +15,39 @@ 


<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>

                <shape>

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

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

                </shape>

            </item>

            <item>

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

                    <corners android:radius="@dimen/grid_item_thumbnail_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_thumbnail_radius" />

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

        </shape>

    </item>



    <!-- unselected -->

    <item

        android:state_focused="true"

        android:state_hovered="true">

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

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

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

        </shape>

    </item>

</selector>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        android:layout_width="@dimen/grid_item_thumbnail_width"

        android:layout_height="@dimen/grid_item_thumbnail_height"

        android:layout_centerHorizontal="true"

        android:duplicateParentState="true"

        android:background="@drawable/grid_thumbnail_background">



        <!-- stroke width will be controlled dynamically in the code. -->

res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    <dimen name="drag_shadow_size">120dp</dimen>

    <dimen name="grid_item_thumbnail_width">80dp</dimen>

    <dimen name="grid_item_thumbnail_height">80dp</dimen>

    <dimen name="grid_item_thumbnail_radius">12dp</dimen>

    <dimen name="grid_item_thumbnail_radius">20dp</dimen>

    <dimen name="grid_item_icon_width">64dp</dimen>

    <dimen name="grid_item_icon_height">64dp</dimen>

    <dimen name="grid_item_nameplate_width">142dp</dimen>