Merge "[DocsUI M3] Restyle breadcrumb" into main (be161fd3) · Commits · e / os / android_packages_apps_DocumentsUI

res/flag(com.android.documentsui.flags.use_material3)/color/breadcrumb_item_ripple_color.xml

0 → 100644

+20 −0

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

		https://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.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:alpha="@dimen/ripple_overlay_alpha" android:color="?attr/colorOnSurfaceVariant"/>
		</selector>
		No newline at end of file

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_enabled="true"
		android:color="?android:colorAccent" />
		<item android:color="?android:attr/colorControlNormal" />
		<item android:state_enabled="false"
		android:color="?attr/colorOnSurface" />
		<item android:color="?attr/colorOnSurfaceVariant" />
		</selector>

+26 −14

Original line number	Diff line number	Diff line
		@@ -17,25 +17,37 @@
		<ripple
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:color="?attr/colorControlHighlight">
		android:color="@color/breadcrumb_item_ripple_color">
		<item
		android:id="@android:id/mask"
		android:drawable="@android:color/white"/>
		android:drawable="@drawable/breadcrumb_item_mask"/>

		<item>
		<selector>
		<item
		app:state_highlighted="true"
		android:drawable="@color/item_breadcrumb_background_hovered"/>
		<item
		app:state_highlighted="false"
		android:drawable="@android:color/transparent">
		<corners
		android:topLeftRadius="2dp"
		android:topRightRadius="2dp"
		android:bottomLeftRadius="2dp"
		android:bottomRightRadius="2dp"
		/>
		<item android:state_pressed="true">
		<shape android:tint="?attr/colorOnSurfaceVariant">
		<corners android:radius="@dimen/breadcrumb_item_height" />
		<solid android:color="@color/overlay_hover_color_percentage" />
		</shape>
		</item>
		<item android:state_focused="true">
		<shape>
		<corners android:radius="@dimen/breadcrumb_item_height" />
		<stroke
		android:width="@dimen/focus_ring_width"
		android:color="?attr/colorSecondary" />
		</shape>
		</item>
		<item android:state_hovered="true">
		<shape android:tint="?attr/colorOnSurfaceVariant">
		<corners android:radius="@dimen/breadcrumb_item_height" />
		<solid android:color="@color/overlay_hover_color_percentage" />
		</shape>
		</item>

		<!-- Default: use the container background. -->
		<item>
		<color android:color="@android:color/transparent"/>
		</item>
		</selector>
		</item>

0 → 100644

+21 −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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android">
		<corners android:radius="@dimen/breadcrumb_item_height" />
		<!-- The color here doesn't matter, it's just being used as a mask. -->
		<solid android:color="@android:color/white" />
		</shape>
		No newline at end of file

+7 −7

Original line number	Diff line number	Diff line
		@@ -17,10 +17,10 @@
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:autoMirrored="true"
		android:viewportWidth="24"
		android:viewportHeight="24">
		android:viewportWidth="960"
		android:viewportHeight="960"
		android:autoMirrored="true">
		<path
		android:fillColor="?android:attr/colorControlNormal"
		android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6 -6,-6z"/>
		android:fillColor="?attr/colorSecondary"
		android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z"/>
		</vector>