diff options
| author | 2020-09-23 21:48:12 +0000 | |
|---|---|---|
| committer | 2020-09-23 21:48:12 +0000 | |
| commit | 2e464177095171224b2d211cd8eb52aef56bb9e9 (patch) | |
| tree | a0574dfb9fe3b0de52c9ba984285873a474616f0 /res/layout | |
| parent | 6f5fffff9e287faa4ec48367c9aa1bb576326515 (diff) | |
| parent | 5f61603bc2f4cdfbb58dc21d40534fbb38fef2e4 (diff) | |
Merge "Add shadow to top toolbar." into mainline-prod am: 5f61603bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/12640590
Change-Id: I0db3dab8622d126058a6156f33ae5e9332338e54
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 74e219cbc..589953d54 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" |