Merge "Fix dropdown text is not clear in dark mode" into tm-dev (a98c7e84) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SettingsSpinner/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ android_library {

	static_libs: [		static_libs: [
	"androidx.preference_preference",		"androidx.preference_preference",
			"SettingsLibSettingsTheme",
	],		],

	sdk_version: "system_current",		sdk_version: "system_current",

deleted100644 → 0

+0 −20

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

	<resources>
	<color name="settingslib_spinner_title_color">@android:color/system_neutral1_900</color>
	<color name="settingslib_spinner_dropdown_color">@android:color/system_neutral2_700</color>
	</resources>

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,4 +79,7 @@
	<color name="settingslib_colorAccentSecondary">@color/settingslib_accent_secondary_device_default</color>		<color name="settingslib_colorAccentSecondary">@color/settingslib_accent_secondary_device_default</color>

	<color name="settingslib_colorSurface">@color/settingslib_surface_light</color>		<color name="settingslib_colorSurface">@color/settingslib_surface_light</color>

			<color name="settingslib_spinner_title_color">@android:color/system_neutral1_900</color>
			<color name="settingslib_spinner_dropdown_color">@android:color/system_neutral2_700</color>
	</resources>		</resources>

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,4 +54,15 @@
	<item name="android:layout_marginTop">16dp</item>		<item name="android:layout_marginTop">16dp</item>
	<item name="android:layout_marginBottom">8dp</item>		<item name="android:layout_marginBottom">8dp</item>
	</style>		</style>

			<style name="SpinnerItem.SettingsLib"
			parent="@android:style/Widget.DeviceDefault.TextView.SpinnerItem">
			<item name="android:textColor">@color/settingslib_spinner_dropdown_color</item>
			</style>

			<style name="SpinnerDropDownItem.SettingsLib"
			parent="@android:style/Widget.Material.DropDownItem.Spinner">
			<item name="android:textColor">@color/settingslib_spinner_dropdown_color</item>
			</style>

	</resources>		</resources>

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@
	<item name="android:switchStyle">@style/Switch.SettingsLib</item>		<item name="android:switchStyle">@style/Switch.SettingsLib</item>
	<item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBar.SettingsLib</item>		<item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBar.SettingsLib</item>
	<item name="android:spinnerStyle">@style/Spinner.SettingsLib</item>		<item name="android:spinnerStyle">@style/Spinner.SettingsLib</item>
			<item name="android:spinnerItemStyle">@style/SpinnerItem.SettingsLib</item>
			<item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItem.SettingsLib</item>
	</style>		</style>

	<!-- Using in SubSettings page including injected settings page -->		<!-- Using in SubSettings page including injected settings page -->