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

Commit e529d68e authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Android (Google) Code Review
Browse files

Merge "Align filters with folders in folder view." into mainline-prod

parents 8f826916 53112da7

res/layout/search_chip_item.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:checkable="true"

    android:checkable="true"

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginStart="@dimen/search_chip_spacing"

    android:layout_marginStart="@dimen/search_chip_half_spacing"

    android:layout_marginEnd="@dimen/search_chip_half_spacing"

    android:textAppearance="@style/SearchChipText"

    android:textAppearance="@style/SearchChipText"

    android:textColor="@color/search_chip_text_color"

    android:textColor="@color/search_chip_text_color"

    app:checkedIcon="@drawable/ic_check"

    app:checkedIcon="@drawable/ic_check"

res/layout/search_chip_row.xml

+11 −4
Original line number Original line Diff line number Diff line
@@ -20,9 +20,16 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:overScrollMode="never"

    android:overScrollMode="never"

    android:scrollbars="none">

    android:scrollbars="none">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



        <LinearLayout

        <LinearLayout

            android:id="@+id/search_chip_group"

            android:id="@+id/search_chip_group"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

        android:paddingEnd="@dimen/search_chip_spacing"/>

            android:layout_marginStart="@dimen/search_chip_group_margin"

            android:layout_marginEnd="@dimen/search_chip_group_margin"/>

    </FrameLayout>

</HorizontalScrollView>
 
</HorizontalScrollView>
 
 No newline at end of file

res/values/dimens.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -89,8 +89,9 @@ 
    <dimen name="root_info_header_height">60dp</dimen>

    <dimen name="root_info_header_height">60dp</dimen>

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

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





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

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

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

    <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_icon_padding">4dp</dimen>

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

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

src/com/android/documentsui/queries/SearchChipViewManager.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -425,9 +425,10 @@ public class SearchChipViewManager { 
            return;

            return;

        }

        }





        final int chipSpacing = mChipGroup.getPaddingEnd();

        final int chipSpacing = mChipGroup.getResources().getDimensionPixelSize(

                R.dimen.search_chip_spacing);

        final boolean isRtl = mChipGroup.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;

        final boolean isRtl = mChipGroup.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;

        float lastX = isRtl ? mChipGroup.getWidth() - chipSpacing : chipSpacing;

        float lastX = isRtl ? mChipGroup.getWidth() - chipSpacing / 2 : chipSpacing / 2;





        // remove all chips except current clicked chip to avoid losing

        // remove all chips except current clicked chip to avoid losing

        // accessibility focus.

        // accessibility focus.