diff options
Diffstat (limited to 'res')
| -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 | ||||
| -rw-r--r-- | res/values-sw720dp/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
6 files changed, 12 insertions, 28 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" diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 7ce3b5307..85c370ab9 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -28,6 +28,4 @@ <dimen name="search_bar_text_margin_start">55dp</dimen> <dimen name="search_bar_text_margin_end">24dp</dimen> <dimen name="search_bar_icon_padding">16dp</dimen> - - <dimen name="action_bar_space_margin">0dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 533e16b5d..3b326e136 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -111,15 +111,16 @@ <dimen name="apps_row_exit_icon_margin_bottom">6dp</dimen> <dimen name="apps_row_item_text_margin_horizontal">8dp</dimen> + <dimen name="search_bar_elevation">3dp</dimen> <dimen name="search_bar_radius">8dp</dimen> <dimen name="search_bar_background_margin_start">0dp</dimen> <dimen name="search_bar_background_margin_end">0dp</dimen> <dimen name="search_bar_margin">8dp</dimen> <dimen name="search_bar_text_size">16dp</dimen> + + <dimen name="action_bar_elevation">3dp</dimen> + <dimen name="action_bar_margin">1dp</dimen> <dimen name="action_bar_size">48dp</dimen> - <!--This value should equal actionBarSize + (2 x search_bar_margin)--> - <dimen name="action_bar_space_height">64dp</dimen> - <dimen name="action_bar_space_margin">@dimen/action_bar_space_height</dimen> <dimen name="action_mode_text_size">18sp</dimen> <dimen name="refresh_icon_range">64dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7b90d06dc..d35005af2 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,7 +21,7 @@ <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode"> <!-- attr "height" was used by support lib should not in overlay scope --> - <item name="height">@dimen/action_bar_space_height</item> + <item name="height">@dimen/action_bar_size</item> <item name="titleTextStyle">@style/ActionModeTitle</item> <item name="android:layout_margin">@dimen/search_bar_margin</item> </style> |