Snap for 13235988 from 98129c980bbd136e8971e268609023e10ac88b2f to 25Q2-release (678049b8) · Commits · e / os / android_packages_apps_DocumentsUI

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@
		android:id="@+id/horizontal_breadcrumb"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?attr/colorSurfaceBright" />
		android:background="?attr/colorSurfaceBright"
		android:paddingHorizontal="@dimen/breadcrumb_padding_horizontal" />

		<androidx.coordinatorlayout.widget.CoordinatorLayout
		android:id="@+id/container_save"

+2 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,8 @@
		<com.android.documentsui.HorizontalBreadcrumb
		android:id="@+id/horizontal_breadcrumb"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		android:layout_height="wrap_content"
		android:paddingHorizontal="@dimen/breadcrumb_padding_horizontal" />

		</LinearLayout>

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2025 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.
		-->

		<com.google.android.material.progressindicator.CircularProgressIndicator
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		style="@style/JobProgressToolbarIndicatorStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clickable="true"
		android:focusable="true" />

+2 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,8 @@
		<com.android.documentsui.HorizontalBreadcrumb
		android:id="@+id/horizontal_breadcrumb"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		android:layout_height="wrap_content"
		android:paddingHorizontal="@dimen/breadcrumb_padding_horizontal" />
		</LinearLayout>

		<androidx.coordinatorlayout.widget.CoordinatorLayout

+16 −5

Original line number	Diff line number	Diff line
		@@ -20,10 +20,21 @@
		android:layout_height="wrap_content"
		android:scrollbars="none">

		<!-- This additional FrameLayout layer is essential to make HorizontalScrollView work with the
		marginHorizontal on the ChipGroup below, without this the scroll behavior is weird.
		Alternatively we could use paddingHorizontal on the ChipGroup below to make it work with
		HorizontalScrollView, but that cause a weird padding issue in RTL.
		-->
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<com.google.android.material.chip.ChipGroup
		android:id="@+id/search_chip_group"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingHorizontal="@dimen/main_container_padding_start"
		android:layout_marginHorizontal="@dimen/main_container_padding_start"
		android:paddingVertical="@dimen/search_chip_group_padding_vertical" />

		</FrameLayout>
		</HorizontalScrollView>