From 53112da78dd59a5537b5dcbfe8fa7cb1293a9e50 Mon Sep 17 00:00:00 2001
From: Zemiao Zhu <zemiao@google.com>
Date: Fri, 18 Sep 2020 17:32:58 -0700
Subject: Align filters with folders in folder view.

Bug: 168244221
Test: manual
Change-Id: Icecd35f5a7ad947b877b25e5e8acbbdff968ed57
---
 res/layout/search_chip_item.xml |  3 ++-
 res/layout/search_chip_row.xml  | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'res/layout')

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
-- 
cgit v1.2.3-59-g8ed1b