Merge "Update color for ProfileSelector with Material3 tokens" into main (5db43b42) · Commits · e / os / android_frameworks_base

packages/SettingsLib/ProfileSelector/res/color-night-v36/settingslib_tabs_indicator_color.xml→packages/SettingsLib/ProfileSelector/res/color-night-v35/settingslib_tabs_indicator_color.xml

+2 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2024 The Android Open Source Project
		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.
		@@ -15,5 +15,5 @@
		limitations under the License.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@color/settingslib_materialColorSecondaryFixed" />
		<item android:color="@color/settingslib_materialColorPrimary" />
		</selector>
		No newline at end of file

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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_selected="true" android:color="@color/settingslib_materialColorOnPrimary"/>
		<item android:state_enabled="false" android:color="?android:attr/textColorTertiary"/>
		<item android:color="@color/settingslib_materialColorOnSurfaceVariant"/>
		</selector>
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,5 +15,5 @@
		limitations under the License.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@color/settingslib_materialColorPrimaryFixed" />
		<item android:color="@color/settingslib_materialColorPrimary" />
		</selector>
		No newline at end of file

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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_selected="true" android:color="@color/settingslib_materialColorOnPrimary"/>
		<item android:state_enabled="false" android:color="?android:attr/textColorTertiary"/>
		<item android:color="@color/settingslib_materialColorOnSurfaceVariant"/>
		</selector>
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		android:insetLeft="4dp"
		android:insetRight="4dp">
		<shape android:shape="rectangle">
		<solid android:color="@color/settingslib_colorSurface" />
		<solid android:color="@color/settingslib_materialColorSurfaceBright" />
		<corners android:radius="12dp" />
		</shape>
		</inset>