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

Commit 8272d0f2 authored by Wenbo Jie (介文博)'s avatar Wenbo Jie (介文博) Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Fix thumbnail corner pixelation" into main

parents 693fa8f6 5f78797f

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"

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

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    <dimen name="icon_size">40dp</dimen>

    <dimen name="button_touch_size">48dp</dimen>

    <dimen name="root_icon_size">24dp</dimen>

    <dimen name="thumbnail_clip_corner_radius">6dp</dimen>

    <dimen name="thumbnail_border_width">1dp</dimen>

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

    <dimen name="root_icon_margin">0dp</dimen>
@@ -38,6 +37,7 @@ 
    <dimen name="check_icon_size">20dp</dimen>

    <dimen name="zoom_icon_size">24dp</dimen>

    <dimen name="list_item_thumbnail_size">40dp</dimen>

    <dimen name="list_item_thumbnail_corner_radius">8dp</dimen>

    <dimen name="grid_item_icon_size">30dp</dimen>

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

    <dimen name="progress_bar_height">4dp</dimen>
@@ -87,6 +87,7 @@ 
    <dimen name="grid_item_nameplate_marginTop">@dimen/space_extra_small_2</dimen>

    <dimen name="grid_item_nameplate_radius">8dp</dimen>

    <dimen name="grid_item_nameplate_inner_radius">4dp</dimen>

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

    <dimen name="grid_item_elevation">2dp</dimen>

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

    <dimen name="max_drawer_width">280dp</dimen>

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

+36 −3
Original line number Diff line number Diff line
@@ -53,11 +53,44 @@ 
        <item name="android:layout_margin">@dimen/search_bar_margin</item>

    </style>



    <style name="CardViewStyle" parent="@style/Widget.Material3.CardView.Outlined">

        <item name="cardBackgroundColor">@color/app_background_color</item>

    <style name="ThumbnailCardViewStyle" parent="@style/Widget.Material3.CardView.Outlined">

        <item name="cardBackgroundColor">?attr/colorSurfaceContainerLowest</item>

        <item name="cardPreventCornerOverlap">false</item>

        <item name="cardCornerRadius">@dimen/grid_item_radius</item>

        <item name="cardElevation">@dimen/grid_item_elevation</item>

        <item name="cardElevation">0dp</item>

        <item name="strokeWidth">0dp</item>

    </style>



    <style name="ListThumbnailCardViewStyle" parent="@style/ThumbnailCardViewStyle">

        <item name="cardCornerRadius">@dimen/list_item_thumbnail_corner_radius</item>

    </style>



    <style name="GridThumbnailCardViewStyle" parent="@style/ThumbnailCardViewStyle">

        <item name="cardCornerRadius">@dimen/grid_item_radius</item>

    </style>



    <style name="ThumbnailImageViewStyle" parent="">

        <item name="strokeColor">?attr/colorSecondaryContainer</item>

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

        <item name="strokeWidth">0dp</item>

    </style>



    <style name="ListThumbnailImageViewStyle" parent="@style/ThumbnailImageViewStyle">

        <item name="shapeAppearance">@style/ListThumbnailImageViewShapeAppearance</item>

    </style>



    <style name="GridThumbnailImageViewStyle" parent="@style/ThumbnailImageViewStyle">

        <item name="shapeAppearance">@style/GridThumbnailImageViewShapeAppearance</item>

    </style>



    <style name="ListThumbnailImageViewShapeAppearance" parent="">

        <item name="cornerFamily">rounded</item>

        <item name="cornerSize">@dimen/list_item_thumbnail_corner_radius</item>

    </style>



    <style name="GridThumbnailImageViewShapeAppearance" parent="">

        <item name="cornerFamily">rounded</item>

        <item name="cornerSize">@dimen/grid_item_radius</item>

    </style>



    <style name="SnackbarButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">