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

Commit 6f5fffff authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/12642744

Change-Id: I358105d3767c1b9623bbfb23d030f1398d82542e
parents 1ed74f48 e529d68e

res/layout/search_chip_item.xml

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

    android:layout_width="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:textColor="@color/search_chip_text_color"

    app:checkedIcon="@drawable/ic_check"

res/layout/search_chip_row.xml

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

    android:overScrollMode="never"

    android:scrollbars="none">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



        <LinearLayout

            android:id="@+id/search_chip_group"

            android:layout_width="match_parent"

            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>
 
 No newline at end of file

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -89,8 +89,9 @@ 
    <dimen name="root_info_header_height">60dp</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_half_spacing">4dp</dimen>

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

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

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

+4 −3
Original line number Diff line number Diff line
@@ -425,9 +425,10 @@ public class SearchChipViewManager { 
            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;

        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

        // accessibility focus.