Merge "[DocsUI M3] Update styles for nav tree item row" into main (50ae92d9) · Commits · e / os / android_packages_apps_DocumentsUI

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

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -15,10 +15,9 @@
	-->		-->

	<selector xmlns:android="http://schemas.android.com/apk/res/android">		<selector xmlns:android="http://schemas.android.com/apk/res/android">
	<item
	android:state_activated="false"
	android:color="?android:colorControlNormal" />
	<item		<item
	android:state_activated="true"		android:state_activated="true"
	android:color="?android:colorControlActivated" />		android:color="?attr/colorOnSecondaryContainer" />
			<item
			android:color="?attr/colorOnSurfaceVariant" />
	</selector>		</selector>

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -15,8 +15,6 @@
	-->		-->

	<selector xmlns:android="http://schemas.android.com/apk/res/android">		<selector xmlns:android="http://schemas.android.com/apk/res/android">
	<item android:state_focused="true" android:state_activated="true" android:color="?android:colorControlActivated" />		<item android:state_activated="true" android:color="?attr/colorOnSecondaryContainer" />
	<item android:state_focused="false" android:state_activated="true" android:color="?android:colorControlActivated" />		<item android:color="?attr/colorOnSurfaceVariant" />
	<item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorPrimary" />
	<item android:color="?android:textColorPrimary" />
	</selector>		</selector>

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

0 → 100644

+22 −0

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

			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:state_activated="true"
			android:alpha="@dimen/ripple_overlay_alpha" android:color="?attr/colorOnSecondaryContainer"/>
			<item android:alpha="@dimen/ripple_overlay_alpha" android:color="?attr/colorOnSurface"/>
			</selector>
			No newline at end of file

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

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,10 +16,6 @@
	-->		-->

	<selector xmlns:android="http://schemas.android.com/apk/res/android">		<selector xmlns:android="http://schemas.android.com/apk/res/android">
	<item android:state_focused="true" android:state_activated="true"		<item android:state_activated="true" android:color="?attr/colorOnSecondaryContainer" />
	android:color="?android:colorControlActivated" />		<item android:color="?attr/colorOnSurfaceVariant" />
	<item android:state_focused="false" android:state_activated="true"
	android:color="?android:colorControlActivated" />
	<item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorSecondary" />
	<item android:color="?android:textColorSecondary" />
	</selector>		</selector>

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

+97 −11

Original line number	Original line	Diff line number	Diff line
	@@ -17,27 +17,113 @@
	<ripple		<ripple
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	xmlns:app="http://schemas.android.com/apk/res-auto"		xmlns:app="http://schemas.android.com/apk/res-auto"
	android:color="?android:attr/colorControlHighlight">		android:color="@color/item_root_ripple_color">

			<!-- The mask below only works for the ripple itself, doesn't work for other <item>s, we
			need to explicitly apply the drawable if the other items also need this mask. -->
	<item		<item
	android:id="@android:id/mask"		android:id="@android:id/mask"
	android:drawable="@drawable/root_list_selector"/>		android:drawable="@drawable/root_list_selector"/>

	<item>		<item>
	<selector>		<selector>
			<!-- Selected (activated). -->
			<!-- Highlight: when dragging files over the item. -->
			<item android:state_activated="true" app:state_highlighted="true">
			<layer-list>
			<item>
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="?attr/colorSecondaryContainer"/>
			</shape>
			</item>
			<item>
			<shape android:tint="?attr/colorOnSecondaryContainer">
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
			</item>
			</layer-list>
			</item>
			<item android:state_activated="true" android:state_pressed="true">
			<layer-list>
			<item>
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="?attr/colorSecondaryContainer"/>
			</shape>
			</item>
			<item>
			<shape android:tint="?attr/colorOnSecondaryContainer">
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
			</item>
			</layer-list>
			</item>
			<item android:state_activated="true" android:state_focused="true">
			<layer-list>
			<item>
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="?attr/colorSecondaryContainer"/>
			</shape>
			</item>
			<item>
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<stroke android:width="@dimen/focus_ring_width" android:color="?attr/colorSecondary"/>
			</shape>
			</item>
			</layer-list>
			</item>
			<item android:state_activated="true" android:state_hovered="true">
			<layer-list>
			<item>
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="?attr/colorSecondaryContainer"/>
			</shape>
			</item>
			<item>
			<shape android:tint="?attr/colorOnSecondaryContainer">
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
			</item>
			</layer-list>
			</item>
			<item android:state_activated="true" android:drawable="@drawable/root_list_selector"/>

			<!-- Unselected. -->
	<item app:state_highlighted="true">		<item app:state_highlighted="true">
	<color android:color="?android:attr/colorControlHighlight"/>		<shape android:tint="?attr/colorOnSurface">
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
	</item>		</item>
	<item		<item android:state_pressed="true">
	app:state_highlighted="false"		<shape android:tint="?attr/colorOnSurface">
	android:drawable="@android:color/transparent"/>		<corners android:radius="@dimen/drawer_item_height"/>
	</selector>		<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
			</item>
			<item android:state_focused="true">
			<shape>
			<corners android:radius="@dimen/drawer_item_height"/>
			<stroke android:width="@dimen/focus_ring_width" android:color="?attr/colorSecondary"/>
			</shape>
			</item>
			<item android:state_hovered="true">
			<shape android:tint="?attr/colorOnSurface">
			<corners android:radius="@dimen/drawer_item_height"/>
			<solid android:color="@color/overlay_color_percentage_10"/>
			</shape>
	</item>		</item>

	<item>		<!-- Default: use the container background. -->
	<selector>
	<item		<item
	android:state_activated="true"		android:drawable="@android:color/transparent"/>
	android:drawable="@drawable/root_list_selector"/>
	</selector>		</selector>
	</item>		</item>
	</ripple>		</ripple>
			No newline at end of file