Merge "Fixes wrong colors on internet/bluethooth dialog" into main (4cee69ff) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/color/connected_network_primary_color.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<item android:color="?androidprv:attr/materialColorOnPrimaryContainer" />
		</selector>
		No newline at end of file

+2 −1

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

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item>
		<shape android:shape="rectangle">
		<solid android:color="@color/settingslib_state_on_color"/>
		<solid android:color="?androidprv:attr/materialColorPrimaryContainer"/>
		<corners android:radius="@dimen/settingslib_switch_bar_radius"/>
		</shape>
		</item>

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,8 @@
		limitations under the License.
		-->

		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<item
		android:top="@dimen/settingslib_switch_thumb_margin"
		android:bottom="@dimen/settingslib_switch_thumb_margin">
		@@ -23,7 +24,7 @@
		<size
		android:height="@dimen/settingslib_switch_thumb_size"
		android:width="@dimen/settingslib_switch_thumb_size"/>
		<solid android:color="@color/settingslib_state_on_color"/>
		<solid android:color="?androidprv:attr/materialColorOnPrimary"/>
		</shape>
		</item>
		</layer-list>

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,11 +16,12 @@
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:shape="rectangle"
		android:width="@dimen/settingslib_switch_track_width"
		android:height="@dimen/settingslib_switch_track_height">
		<padding android:left="@dimen/settingslib_switch_thumb_margin"
		android:right="@dimen/settingslib_switch_thumb_margin"/>
		<solid android:color="@color/settingslib_track_on_color"/>
		<solid android:color="?androidprv:attr/materialColorPrimary"/>
		<corners android:radius="@dimen/settingslib_switch_track_radius"/>
		</shape>

+0 −4

Original line number	Diff line number	Diff line
		@@ -104,10 +104,6 @@

		<color name="people_tile_background">@color/material_dynamic_secondary20</color>

		<!-- Internet Dialog -->
		<color name="connected_network_primary_color">@color/material_dynamic_primary80</color>
		<color name="connected_network_secondary_color">@color/material_dynamic_secondary80</color>

		<!-- Keyboard shortcut helper dialog -->
		<color name="ksh_key_item_color">@*android:color/system_on_surface_variant_dark</color>
		</resources>