diff options
| author | 2020-09-17 18:28:38 -0700 | |
|---|---|---|
| committer | 2020-09-18 14:28:55 -0700 | |
| commit | 724581f6eab936a6596787a144ebe7e491ab2151 (patch) | |
| tree | 523a787dba8b0bb57a1067d3d16e9bc1c3b5b8fb /res/layout | |
| parent | cce7f88c777d2469d7a59d1cfc3fe85f9707184d (diff) | |
Add shadow to top toolbar.
To prevent visual glitch when entering selection mode,
we also need to update scroll flag of searchbar,
so that it cannot be scrolled out of screen now.
Bug: 168244886
Test: manual
Change-Id: Ia968ba2719c00ca9fe036ed5a94d2c29a5e2a143
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/directory_app_bar.xml | 13 | ||||
| -rw-r--r-- | res/layout/directory_header.xml | 1 | ||||
| -rw-r--r-- | res/layout/drawer_layout.xml | 15 |
3 files changed, 7 insertions, 22 deletions
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..b7ab7d96a 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 diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index 0b2a81d72..7cb185fad 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" |