diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/dialog_delete_confirmation.xml | 2 | ||||
| -rw-r--r-- | res/layout/dialog_file_name.xml | 1 | ||||
| -rw-r--r-- | res/layout/directory_app_bar.xml | 13 | ||||
| -rw-r--r-- | res/layout/directory_header.xml | 8 | ||||
| -rw-r--r-- | res/layout/drag_shadow_layout.xml | 2 | ||||
| -rw-r--r-- | res/layout/drawer_layout.xml | 21 | ||||
| -rw-r--r-- | res/layout/fragment_directory.xml | 1 | ||||
| -rw-r--r-- | res/layout/fragment_pick.xml | 10 | ||||
| -rw-r--r-- | res/layout/inspector_activity.xml | 1 | ||||
| -rw-r--r-- | res/layout/item_dir_grid.xml | 13 | ||||
| -rw-r--r-- | res/layout/item_doc_grid.xml | 18 | ||||
| -rw-r--r-- | res/layout/item_doc_header_message.xml | 13 | ||||
| -rw-r--r-- | res/layout/item_doc_list.xml | 254 | ||||
| -rw-r--r-- | res/layout/navigation_breadcrumb_item.xml | 1 | ||||
| -rw-r--r-- | res/layout/search_chip_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/search_chip_row.xml | 16 |
16 files changed, 180 insertions, 197 deletions
diff --git a/res/layout/dialog_delete_confirmation.xml b/res/layout/dialog_delete_confirmation.xml index 501736cec..d5b133ee8 100644 --- a/res/layout/dialog_delete_confirmation.xml +++ b/res/layout/dialog_delete_confirmation.xml @@ -21,5 +21,5 @@ android:paddingTop="24dp" android:paddingStart="24dp" android:paddingEnd="24dp" - android:textAppearance="@android:style/TextAppearance.Material.Subhead"> + android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"> </TextView> diff --git a/res/layout/dialog_file_name.xml b/res/layout/dialog_file_name.xml index 0ebd936d0..7f2a9592b 100644 --- a/res/layout/dialog_file_name.xml +++ b/res/layout/dialog_file_name.xml @@ -35,6 +35,7 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" + android:maxLength="255" android:inputType="textCapSentences"/> </com.google.android.material.textfield.TextInputLayout> diff --git a/res/layout/directory_app_bar.xml b/res/layout/directory_app_bar.xml index 3225ce599..ad80ec201 100644 --- a/res/layout/directory_app_bar.xml +++ b/res/layout/directory_app_bar.xml @@ -34,17 +34,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <include layout="@layout/directory_header"/> + <include layout="@layout/directory_header" /> </androidx.core.widget.NestedScrollView> - <View - android:id="@+id/toolbar_background_layout" - android:layout_width="match_parent" - android:layout_height="@dimen/action_bar_space_height" - android:background="?android:attr/colorBackground" - app:layout_collapseMode="pin"/> - <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" @@ -53,7 +46,7 @@ android:background="?android:attr/colorBackground" android:theme="?actionBarTheme" android:popupTheme="?actionBarPopupTheme" - android:elevation="3dp" + android:elevation="@dimen/search_bar_elevation" app:collapseContentDescription="@string/button_back" app:titleTextAppearance="@style/ToolbarTitle" app:layout_collapseMode="pin"> @@ -64,7 +57,7 @@ android:layout_height="?android:attr/actionBarSize" android:gravity="center_vertical" android:text="@string/search_bar_hint" - android:textAppearance="@style/SearchBarTitle"/> + android:textAppearance="@style/SearchBarTitle" /> </androidx.appcompat.widget.Toolbar> diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml index 94c52e978..791af999e 100644 --- a/res/layout/directory_header.xml +++ b/res/layout/directory_header.xml @@ -18,7 +18,6 @@ android:id="@+id/directory_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/action_bar_space_margin" android:orientation="vertical"> <com.android.documentsui.HorizontalBreadcrumb @@ -47,8 +46,8 @@ app:tabMaxWidth="0dp" app:tabGravity="fill" app:tabMode="fixed" - app:tabIndicatorColor="@color/tab_indicator_color" - app:tabSelectedTextColor="@color/tab_indicator_color" + app:tabIndicatorColor="?android:attr/colorAccent" + app:tabSelectedTextColor="?android:attr/colorAccent" app:tabTextAppearance="@style/TabTextAppearance" app:tabTextColor="?android:attr/textColorSecondary"/> @@ -73,8 +72,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:textAppearance="@style/SortTitle" - android:textAllCaps="true" + android:textAppearance="@style/SectionHeader" android:maxLines="1" android:ellipsize="end" android:gravity="start|center_vertical"/> diff --git a/res/layout/drag_shadow_layout.xml b/res/layout/drag_shadow_layout.xml index f42474254..75bd0ca28 100644 --- a/res/layout/drag_shadow_layout.xml +++ b/res/layout/drag_shadow_layout.xml @@ -40,7 +40,7 @@ android:maxLines="1" android:ellipsize="end" android:textAlignment="viewStart" - android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" android:paddingStart="6dp" android:paddingBottom="1dp"/> diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index 0b2a81d72..d08c17d9f 100644 --- a/res/layout/drawer_layout.xml +++ b/res/layout/drawer_layout.xml @@ -38,19 +38,12 @@ android:layout_height="match_parent" app:layout_behavior="@string/scrolling_behavior"> - <LinearLayout + <FrameLayout + android:id="@+id/container_directory" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> - - <FrameLayout - android:id="@+id/container_directory" - android:clipToPadding="false" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - </LinearLayout> + android:layout_weight="1" /> <FrameLayout android:id="@+id/container_search_fragment" @@ -58,8 +51,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <!-- Drawer edge is a dummy view used to capture hovering event - on view edge to open the drawer. (b/28345294) --> + <!-- Drawer edge is a placeholder view used to capture hovering + event on view edge to open the drawer. (b/28345294) --> <View android:id="@+id/drawer_edge" android:background="@android:color/transparent" @@ -95,7 +88,7 @@ android:background="?android:attr/colorBackground" android:elevation="0dp" app:titleTextAppearance="@style/DrawerMenuTitle" - app:titleTextColor="?android:colorPrimary"/> + app:titleTextColor="?android:colorAccent"/> <FrameLayout android:id="@+id/container_roots" diff --git a/res/layout/fragment_directory.xml b/res/layout/fragment_directory.xml index dda841205..015039a6a 100644 --- a/res/layout/fragment_directory.xml +++ b/res/layout/fragment_directory.xml @@ -49,7 +49,6 @@ android:clipToPadding="false" android:scrollbars="none" android:drawSelectorOnTop="true" - android:overScrollMode="never" app:fastScrollEnabled="false"/> </com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout> diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml index 5522c5a81..88c28bdbc 100644 --- a/res/layout/fragment_pick.xml +++ b/res/layout/fragment_pick.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,7 +29,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" - android:text="@android:string/cancel"/> + android:text="@android:string/cancel" /> <FrameLayout android:layout_width="match_parent" @@ -42,13 +41,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:layout_marginEnd="4dp"/> + android:layout_marginEnd="4dp" /> <!-- Handles touch events when button1 is disabled. --> <FrameLayout android:id="@+id/pick_button_overlay" + android:importantForAccessibility="no" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" /> </FrameLayout> diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml index df28d4968..8763351c9 100644 --- a/res/layout/inspector_activity.xml +++ b/res/layout/inspector_activity.xml @@ -68,7 +68,6 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:overScrollMode="never" app:behavior_overlapTop="10dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> diff --git a/res/layout/item_dir_grid.xml b/res/layout/item_dir_grid.xml index 269dd0782..8720c37cf 100644 --- a/res/layout/item_dir_grid.xml +++ b/res/layout/item_dir_grid.xml @@ -21,19 +21,21 @@ to focus and selection states, some of which are specific to keyboard when touch mode is not enable. So, if you, heroic engineer of the future, decide to rip these out, please be sure to check out focus and keyboards. --> -<FrameLayout +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_root" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="2dp" - android:focusable="true"> + android:layout_margin="4dp" + android:foreground="?android:attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + app:cardElevation="0dp"> <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="2dp" android:elevation="0dp" android:duplicateParentState="true" app:cardElevation="0dp" @@ -106,9 +108,8 @@ <View android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="1dp" android:background="@drawable/item_doc_grid_border_rounded" android:contentDescription="@null" android:duplicateParentState="true"/> -</FrameLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml index 0722a9d16..5e2e93842 100644 --- a/res/layout/item_doc_grid.xml +++ b/res/layout/item_doc_grid.xml @@ -20,19 +20,21 @@ to focus and selection states, some of which are specific to keyboard when touch mode is not enable. So, if you, heroic engineer of the future, decide to rip these out, please be sure to check out focus and keyboards. --> -<FrameLayout +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_root" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="2dp" - android:focusable="true"> + android:layout_margin="4dp" + android:foreground="?android:attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + app:cardElevation="0dp"> <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="2dp" android:elevation="0dp" android:duplicateParentState="true" app:cardElevation="0dp" @@ -50,6 +52,7 @@ <FrameLayout android:id="@+id/thumbnail" + android:background="?attr/gridItemTint" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -173,7 +176,7 @@ android:singleLine="true" android:ellipsize="end" android:textAlignment="viewStart" - android:textAppearance="@android:style/TextAppearance.Material.Caption"/> + android:textAppearance="@style/ItemCaptionText" /> <TextView android:id="@+id/date" @@ -184,7 +187,7 @@ android:singleLine="true" android:ellipsize="end" android:textAlignment="viewStart" - android:textAppearance="@android:style/TextAppearance.Material.Caption"/> + android:textAppearance="@style/ItemCaptionText" /> </RelativeLayout> @@ -198,9 +201,8 @@ <View android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="1dp" android:background="@drawable/item_doc_grid_border_rounded" android:contentDescription="@null" android:duplicateParentState="true"/> -</FrameLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/res/layout/item_doc_header_message.xml b/res/layout/item_doc_header_message.xml index 25e69c8eb..4b2cf355f 100644 --- a/res/layout/item_doc_header_message.xml +++ b/res/layout/item_doc_header_message.xml @@ -34,6 +34,7 @@ <LinearLayout android:layout_height="wrap_content" android:layout_width="match_parent" + android:background="?android:attr/colorBackground" android:orientation="vertical"> <LinearLayout @@ -99,20 +100,14 @@ android:layout_width="match_parent" android:orientation="vertical"> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" - android:background="?android:strokeColor"/> - <Button android:id="@+id/action_button" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginStart="48dp" - android:layout_gravity="start" + android:layout_marginEnd="16dp" + android:layout_gravity="end" style="@style/DialogTextButton"/> + </LinearLayout> </LinearLayout> diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml index 1189482a2..0942c4b5f 100644 --- a/res/layout/item_doc_list.xml +++ b/res/layout/item_doc_list.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,15 +14,16 @@ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_root" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/list_item_background" + android:foreground="?android:attr/selectableItemBackground" + android:clickable="true" android:focusable="true" - android:orientation="horizontal" > - + android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" @@ -31,136 +31,132 @@ android:baselineAligned="false" android:gravity="center_vertical" android:minHeight="@dimen/list_item_height" - android:orientation="horizontal" > - - <FrameLayout - android:id="@+id/icon" - android:pointerIcon="hand" - android:layout_width="@dimen/list_item_width" - android:layout_height="@dimen/list_item_height" - android:paddingBottom="@dimen/list_item_icon_padding" - android:paddingTop="@dimen/list_item_icon_padding" - android:paddingEnd="16dp" - android:paddingStart="@dimen/list_item_padding" > - - <ImageView - android:id="@+id/icon_mime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:contentDescription="@null" - android:scaleType="centerInside" /> - - <ImageView - android:id="@+id/icon_thumb" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:contentDescription="@null" - android:scaleType="centerCrop" /> - - <ImageView - android:id="@+id/icon_check" - android:layout_width="@dimen/check_icon_size" - android:layout_height="@dimen/check_icon_size" - android:layout_gravity="center" - android:alpha="0" - android:contentDescription="@null" - android:scaleType="fitCenter" - android:src="@drawable/ic_check_circle" /> - </FrameLayout> + android:orientation="horizontal"> + + <FrameLayout + android:id="@+id/icon" + android:pointerIcon="hand" + android:layout_width="@dimen/list_item_width" + android:layout_height="@dimen/list_item_height" + android:paddingBottom="@dimen/list_item_icon_padding" + android:paddingTop="@dimen/list_item_icon_padding" + android:paddingEnd="16dp" + android:paddingStart="@dimen/list_item_padding"> + + <com.google.android.material.card.MaterialCardView + android:layout_width="match_parent" + android:layout_height="match_parent" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp"> + + <ImageView + android:id="@+id/icon_mime" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:contentDescription="@null" + android:scaleType="centerInside" /> + + <ImageView + android:id="@+id/icon_thumb" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:contentDescription="@null" + android:scaleType="centerCrop" /> + + <ImageView + android:id="@+id/icon_check" + android:layout_width="@dimen/check_icon_size" + android:layout_height="@dimen/check_icon_size" + android:layout_gravity="center" + android:alpha="0" + android:contentDescription="@null" + android:scaleType="fitCenter" + android:src="@drawable/ic_check_circle" /> + + </com.google.android.material.card.MaterialCardView> + + </FrameLayout> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/list_item_padding"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1"> + + <ImageView + android:id="@+id/icon_briefcase" + android:layout_height="@dimen/briefcase_icon_size" + android:layout_width="@dimen/briefcase_icon_size" + android:layout_marginEnd="@dimen/briefcase_icon_margin" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_briefcase" + android:contentDescription="@string/a11y_work" /> + + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceListItem" /> + + </LinearLayout> <LinearLayout - android:layout_width="0dp" + android:id="@+id/line2" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_marginEnd="@dimen/list_item_padding" > - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_weight="1"> - - <ImageView - android:id="@+id/icon_briefcase" - android:layout_height="@dimen/briefcase_icon_size" - android:layout_width="@dimen/briefcase_icon_size" - android:layout_marginEnd="@dimen/briefcase_icon_margin" - android:layout_gravity="center_vertical" - android:src="@drawable/ic_briefcase" - android:contentDescription="@string/a11y_work"/> - - <TextView - android:id="@android:id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:textAlignment="viewStart" - android:textAppearance="?android:attr/textAppearanceListItem"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/line2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:baselineAligned="false" - android:gravity="center_vertical" - android:orientation="horizontal" > - - <TextView - android:id="@+id/date" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.4" - android:ellipsize="end" - android:singleLine="true" - android:textAlignment="viewStart" - android:textAppearance="@style/ItemDocListCaptionText"/> - - <TextView - android:id="@+id/size" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_weight="0.3" - android:ellipsize="end" - android:singleLine="true" - android:textAlignment="viewStart" - android:textAppearance="@style/ItemDocListCaptionText"/> - - <TextView - android:id="@+id/file_type" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_weight="0.3" - android:ellipsize="end" - android:singleLine="true" - android:textAlignment="viewStart" - android:textAppearance="@style/ItemDocListCaptionText"/> - </LinearLayout> + android:baselineAligned="false" + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + <TextView + android:id="@+id/metadata" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="@style/ItemCaptionText" /> + </LinearLayout> - <FrameLayout - android:id="@+id/preview_icon" - android:layout_width="@dimen/list_item_width" - android:layout_height="@dimen/list_item_height" - android:padding="@dimen/list_item_icon_padding" - android:focusable="true" - android:clickable="true"> + </LinearLayout> - <ImageView - android:layout_width="@dimen/check_icon_size" - android:layout_height="@dimen/check_icon_size" - android:layout_gravity="center" - android:scaleType="fitCenter" - android:tint="?android:attr/colorControlNormal" - android:src="@drawable/ic_zoom_out"/> + <FrameLayout + android:id="@+id/preview_icon" + android:layout_width="@dimen/list_item_width" + android:layout_height="@dimen/list_item_height" + android:padding="@dimen/list_item_icon_padding" + android:focusable="true" + android:clickable="true"> - </FrameLayout> + <ImageView + android:layout_width="@dimen/check_icon_size" + android:layout_height="@dimen/check_icon_size" + android:layout_gravity="center" + android:scaleType="fitCenter" + android:tint="?android:attr/colorControlNormal" + android:src="@drawable/ic_zoom_out" /> + + </FrameLayout> </LinearLayout> -</LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginStart="72dp" + android:layout_marginEnd="8dp" + android:background="?android:strokeColor" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/navigation_breadcrumb_item.xml b/res/layout/navigation_breadcrumb_item.xml index a424a66ec..93d3feb3f 100644 --- a/res/layout/navigation_breadcrumb_item.xml +++ b/res/layout/navigation_breadcrumb_item.xml @@ -40,7 +40,6 @@ android:layout_height="match_parent" android:maxWidth="275dp" android:gravity="center_vertical" - android:duplicateParentState="true" android:maxLines="1" android:ellipsize="end" android:textAppearance="@style/BreadcrumbText" 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..ad0ac43c8 100644 --- a/res/layout/search_chip_row.xml +++ b/res/layout/search_chip_row.xml @@ -18,11 +18,17 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" 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 |