Snap for 12727401 from 79c88a032ffc8660a00b42edfbc64ccafdd4db3c to 25Q1-release (24687018) · Commits · e / os / android_packages_apps_DocumentsUI

res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_background.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2024 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.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<solid android:color="?attr/colorSurfaceBright" />
		<corners android:radius="16dp" />
		</shape>
		No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/layout/directory_header.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,7 @@
		<com.android.documentsui.HorizontalBreadcrumb
		android:id="@+id/horizontal_breadcrumb"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?android:attr/colorBackground"/>
		android:layout_height="wrap_content" />

		<!-- used for search chip. -->
		<include layout="@layout/search_chip_row"/>

res/flag(com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml

+33 −29

Original line number	Diff line number	Diff line
		@@ -27,17 +27,39 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="?attr/colorSurfaceContainer"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="horizontal"
		android:baselineAligned="false">

		<FrameLayout
		android:id="@+id/container_roots"
		android:layout_width="256dp"
		android:layout_height="match_parent"
		android:layout_marginTop="@dimen/space_medium_1"
		/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:background="@drawable/main_container_background"
		android:layout_margin="@dimen/space_small_1"
		android:layout_marginStart="0dp">

		<androidx.appcompat.widget.Toolbar
		android:id="@+id/toolbar"
		android:layout_width="match_parent"
		android:layout_height="?android:attr/actionBarSize"
		android:layout_margin="@dimen/search_bar_margin"
		android:background="?android:attr/colorBackground"
		android:elevation="3dp"
		android:theme="?actionBarTheme"
		android:popupTheme="?actionBarPopupTheme"
		android:theme="?actionBarTheme"
		app:collapseContentDescription="@string/button_back"
		app:titleTextAppearance="@style/ToolbarTitle">

		@@ -45,35 +67,17 @@
		android:id="@+id/searchbar_title"
		android:layout_width="match_parent"
		android:layout_height="?android:attr/actionBarSize"
		android:layout_marginStart="@dimen/search_bar_text_margin_start"
		android:layout_marginEnd="@dimen/search_bar_text_margin_end"
		android:paddingStart="@dimen/search_bar_icon_padding"
		android:layout_marginStart="@dimen/search_bar_text_margin_start"
		android:drawablePadding="@dimen/search_bar_icon_padding"
		android:drawableStart="@drawable/ic_menu_search"
		android:gravity="center_vertical"
		android:paddingStart="@dimen/search_bar_icon_padding"
		android:text="@string/search_bar_hint"
		android:textAppearance="@style/SearchBarTitle"
		android:drawableStart="@drawable/ic_menu_search"
		android:drawablePadding="@dimen/search_bar_icon_padding"/>
		android:textAppearance="@style/SearchBarTitle" />

		</androidx.appcompat.widget.Toolbar>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="horizontal"
		android:baselineAligned="false">

		<FrameLayout
		android:id="@+id/container_roots"
		android:layout_width="256dp"
		android:layout_height="match_parent" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:elevation="8dp">

		<include layout="@layout/directory_header" />

		<FrameLayout

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_directory.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,9 +19,6 @@
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="?android:attr/colorBackground"
		android:outlineProvider="bounds"
		android:elevation="4dp"
		android:orientation="vertical">

		<ProgressBar

res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		<dimen name="tab_selector_indicator_height">2dp</dimen>
		<dimen name="profile_tab_padding">0dp</dimen>
		<dimen name="grid_container_padding">20dp</dimen>
		<dimen name="list_container_padding">0dp</dimen>
		<dimen name="list_container_padding">20dp</dimen>
		<dimen name="icon_size">40dp</dimen>
		<dimen name="button_touch_size">48dp</dimen>
		<dimen name="root_icon_size">24dp</dimen>
		@@ -118,7 +118,7 @@
		<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_margin">@dimen/space_extra_small_6</dimen>
		<dimen name="search_bar_text_size">16dp</dimen>

		<dimen name="action_bar_elevation">3dp</dimen>