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

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

Merge "[DocsUI M3] Rename overlayable dimension variables" into main

parents 86cc9cf7 f6206a69

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

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
    <stroke

        android:width="2dp"

        android:color="@color/item_doc_grid_border"/>

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

    <corners android:radius="?attr/shapeCornerSizeMedium"/>

</shape>

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

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
    <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>

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

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

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

    <dimen name="briefcase_icon_margin">8dp</dimen>
@@ -198,9 +199,9 @@ 
    <dimen name="search_chip_spacing">8dp</dimen>

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

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

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

    <!-- block end -->



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

    <dimen name="search_chip_group_padding_vertical">@dimen/space_extra_small_4</dimen>

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

    <dimen name="main_container_padding_start">@dimen/space_small_4</dimen>

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

+4 −11
Original line number Diff line number Diff line
@@ -51,18 +51,16 @@ 
    <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">0dp</item>

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

        <!-- use CardView's default shape ?attr/shapeAppearanceCornerMedium -->

    </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="GridThumbnailCardViewStyle" parent="@style/ThumbnailCardViewStyle" />



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

        <item name="strokeColor">?attr/colorSecondaryContainer</item>
@@ -75,7 +73,7 @@ 
    </style>



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

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

        <item name="shapeAppearance">?attr/shapeAppearanceCornerMedium</item>

    </style>



    <style name="ListThumbnailImageViewShapeAppearance" parent="">
@@ -83,11 +81,6 @@ 
        <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">

        <item name="android:textColor">?android:colorPrimary</item>

    </style>
@@ -148,7 +141,7 @@ 
        <item name="android:textAppearance">@style/SearchChipText</item>

        <item name="chipBackgroundColor">@color/search_chip_background_color</item>

        <item name="chipStrokeColor">@color/search_chip_stroke_color</item>

        <item name="chipCornerRadius">@dimen/search_chip_radius</item>

        <!-- use Chip's default shape ?attr/shapeAppearanceCornerSmall -->

    </style>



    <style name="SearchOptionsTriggerStyle" parent="@style/SearchChipItemStyle">