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

Commit 1ca8b615 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13335674 from 8272d0f2 to 25Q3-release 

Change-Id: I51ba372b7a98113f055bb466c6d6fac695c8b55e
parents 81b5c9ff 8272d0f2

OWNERS

+4 −1
Original line number Diff line number Diff line
@@ -2,5 +2,8 @@ 


include platform/frameworks/base:/core/java/android/os/storage/OWNERS



benreich@google.com

# For one of the below, please use android-files+reviews@google.com as the

# reviewer.

alexbn@google.com

benreich@google.com

wenbojie@google.com

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

+24 −0
Original line number Diff line number Diff line
@@ -81,6 +81,24 @@ 
                    </item>

                </layer-list>

            </item>

            <item

                android:state_drag_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_hovered="true"

                android:state_selected="true">
@@ -139,6 +157,12 @@ 
                        android:color="?attr/colorSecondary" />

                </shape>

            </item>

            <item android:state_drag_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>

            <item android:state_hovered="true">

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

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

res/flag(com.android.documentsui.flags.use_material3)/layout-w900dp/item_doc_list.xml

+4 −7
Original line number Diff line number Diff line
@@ -42,15 +42,11 @@ 
            android:layout_height="@dimen/list_item_icon_size"

            android:layout_marginEnd="@dimen/list_item_icon_margin_end">



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

            <com.google.android.material.card.MaterialCardView

                android:id="@+id/icon_wrapper"

                app:cardElevation="0dp"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                app:cardBackgroundColor="?attr/colorSurfaceContainerLowest"

                app:strokeColor="?attr/colorSecondaryContainer"

                app:strokeWidth="0dp">

                style="@style/ListThumbnailCardViewStyle">



                <ImageView

                    android:id="@+id/icon_mime"
@@ -60,13 +56,14 @@ 
                    android:contentDescription="@null"

                    android:scaleType="centerInside" />



                <ImageView

                <com.google.android.material.imageview.ShapeableImageView

                    android:id="@+id/icon_thumb"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_gravity="center"

                    android:contentDescription="@null"

                    android:scaleType="centerCrop" />

                    android:scaleType="centerCrop"

                    style="@style/ListThumbnailImageViewStyle"/>



                <ImageView

                    android:id="@+id/icon_check"

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

+3 −8
Original line number Diff line number Diff line
@@ -36,25 +36,20 @@ 
        android:duplicateParentState="true"

        android:background="@drawable/grid_thumbnail_background">



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

        <com.google.android.material.card.MaterialCardView

            android:id="@+id/icon_wrapper"

            android:layout_width="@dimen/grid_item_icon_width"

            android:layout_height="@dimen/grid_item_icon_height"

            android:layout_gravity="center"

            app:cardBackgroundColor="?attr/colorSurfaceContainerLowest"

            app:cardElevation="0dp"

            app:strokeColor="?attr/colorSecondaryContainer"

            app:strokeWidth="0dp">

            style="@style/GridThumbnailCardViewStyle">



            <com.android.documentsui.GridItemThumbnail

            <com.google.android.material.imageview.ShapeableImageView

                android:id="@+id/icon_thumb"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:contentDescription="@null"

                android:scaleType="centerCrop"

                android:tint="?attr/gridItemTint"

                android:tintMode="src_over" />

                style="@style/GridThumbnailImageViewStyle" />



            <com.android.documentsui.GridItemThumbnail

                android:id="@+id/icon_mime_lg"

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

+4 −7
Original line number Diff line number Diff line
@@ -42,15 +42,11 @@ 
          android:layout_height="@dimen/list_item_icon_size"

          android:layout_marginEnd="@dimen/list_item_icon_margin_end">



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

        <com.google.android.material.card.MaterialCardView

            android:id="@+id/icon_wrapper"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            app:cardElevation="0dp"

            app:cardBackgroundColor="?attr/colorSurfaceContainerLowest"

            app:strokeColor="?attr/colorSecondaryContainer"

            app:strokeWidth="0dp">

            style="@style/ListThumbnailCardViewStyle">



          <ImageView

              android:id="@+id/icon_mime"
@@ -60,12 +56,13 @@ 
              android:contentDescription="@null"

              android:scaleType="centerInside" />



          <ImageView

          <com.google.android.material.imageview.ShapeableImageView

              android:id="@+id/icon_thumb"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:contentDescription="@null"

              android:scaleType="centerCrop" />

              android:scaleType="centerCrop"

              style="@style/ListThumbnailImageViewStyle" />



          <ImageView

              android:id="@+id/icon_check"