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

Commit c2d371dd authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Update styles for the filter bar 

1. change the focus ring color to use colorSecondary
2. bring the variable search_chip_radius back to not break the
   overlayable
3. put the padding of the chip group on the group level instead
   of the container level, so it won't show additional space
   when the group is hidden (in Saver mode)

Bug: 382381929
Test: Manually inspect after deployment
Flag: com.android.documentsui.flags.use_material3
Change-Id: I517c0a3e615da91dafe7735a9aca1f767572946b
parent f64d4015

res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_stroke_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false"/>



    <!-- Focused: different from default value -->

    <item android:color="?attr/colorPrimary" android:state_focused="true"/>

    <item android:color="?attr/colorSecondary" android:state_focused="true"/>



    <!-- Selected -->

    <item android:color="@android:color/transparent" android:state_selected="true"/>

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

+4 −4
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:scrollbars="none"

    android:paddingHorizontal="@dimen/search_chip_group_margin_horizontal"

    android:paddingVertical="@dimen/search_chip_group_margin_vertical">

    android:scrollbars="none">



    <com.google.android.material.chip.ChipGroup

        android:id="@+id/search_chip_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:paddingHorizontal="@dimen/search_chip_group_margin_horizontal"

        android:paddingVertical="@dimen/search_chip_group_margin_vertical"/>

</HorizontalScrollView>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ 
    <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">16dp</dimen>

    <!-- block end -->

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

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

    <dimen name="search_chip_group_margin_vertical">@dimen/space_small_1</dimen>

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

+1 −0
Original line number Diff line number Diff line
@@ -124,5 +124,6 @@ 
        <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>

    </style>

</resources>