Align filters with folders in folder view.

Bug: 168244221
Test: manual
Change-Id: Icecd35f5a7ad947b877b25e5e8acbbdff968ed57

4 files changed, 19 insertions, 9 deletions

diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml
index cb6799313..3ee00c290 100644
--- a/res/layout/search_chip_item.xml
+++ b/res/layout/search_chip_item.xml
@@ -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"
diff --git a/res/layout/search_chip_row.xml b/res/layout/search_chip_row.xml
index 1375177b8..9917bc5ac 100644
--- a/res/layout/search_chip_row.xml
+++ b/res/layout/search_chip_row.xml
@@ -20,9 +20,16 @@
     android:layout_height="wrap_content"
     android:overScrollMode="never"
     android:scrollbars="none">
-    <LinearLayout
-        android:id="@+id/search_chip_group"
+
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingEnd="@dimen/search_chip_spacing"/>
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:id="@+id/search_chip_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/search_chip_group_margin"
+            android:layout_marginEnd="@dimen/search_chip_group_margin"/>
+    </FrameLayout>
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 07ee69526..533e16b5d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -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>
 
diff --git a/src/com/android/documentsui/queries/SearchChipViewManager.java b/src/com/android/documentsui/queries/SearchChipViewManager.java
index 2305da449..f80a3a7fa 100644
--- a/src/com/android/documentsui/queries/SearchChipViewManager.java
+++ b/src/com/android/documentsui/queries/SearchChipViewManager.java
@@ -399,7 +399,7 @@ public class SearchChipViewManager {
      * Reorder the chips in chip group. The checked chip has higher order.
      *
      * @param clickedChip the clicked chip, may be null.
-     * @param hasAnim if true, play move animation. Otherwise, not.
+     * @param hasAnim     if true, play move animation. Otherwise, not.
      */
     private void reorderCheckedChips(@Nullable Chip clickedChip, boolean hasAnim) {
         final ArrayList<Chip> chipList = new ArrayList<>();
@@ -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.