Merge "Create DialogTheme for Theme.SubSettingsBase" into sc-dev am: 50a503bdf7 (eba008fb) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml

+9 −2

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<!--		<!--
	Copyright (C) 2020 The Android Open Source Project		Copyright (C) 2021 The Android Open Source Project

	Licensed under the Apache License, Version 2.0 (the "License");		Licensed under the Apache License, Version 2.0 (the "License");
	you may not use this file except in compliance with the License.		you may not use this file except in compliance with the License.
	@@ -15,7 +15,7 @@
	limitations under the License.		limitations under the License.
	-->		-->

	<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">		<resources>
	<!-- Material next thumb off color-->		<!-- Material next thumb off color-->
	<color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color>		<color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color>

	@@ -24,4 +24,11 @@

	<!-- Material next track off color-->		<!-- Material next track off color-->
	<color name="settingslib_track_off_color">@android:color/system_neutral1_700</color>		<color name="settingslib_track_off_color">@android:color/system_neutral1_700</color>

			<!-- Dialog accent color -->
			<color name="settingslib_dialog_accent">@android:color/system_accent1_100</color>
			<!-- Dialog background color. -->
			<color name="settingslib_dialog_background">@android:color/system_neutral1_800</color>
			<!-- Dialog error color. -->
			<color name="settingslib_dialog_colorError">#f28b82</color> <!-- Red 300 -->
	</resources>		</resources>
			No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+8 −1

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<!--		<!--
	Copyright (C) 2020 The Android Open Source Project		Copyright (C) 2021 The Android Open Source Project

	Licensed under the Apache License, Version 2.0 (the "License");		Licensed under the Apache License, Version 2.0 (the "License");
	you may not use this file except in compliance with the License.		you may not use this file except in compliance with the License.
	@@ -30,4 +30,11 @@

	<!-- Material next track off color-->		<!-- Material next track off color-->
	<color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>		<color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>

			<!-- Dialog accent color -->
			<color name="settingslib_dialog_accent">@android:color/system_accent1_600</color>
			<!-- Dialog background color -->
			<color name="settingslib_dialog_background">@android:color/system_neutral1_800</color>
			<!-- Dialog error color. -->
			<color name="settingslib_dialog_colorError">#d93025</color> <!-- Red 600 -->
	</resources>		</resources>

packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,5 +33,20 @@
	<!-- Set up edge-to-edge configuration for top app bar -->		<!-- Set up edge-to-edge configuration for top app bar -->
	<item name="android:navigationBarColor">@android:color/transparent</item>		<item name="android:navigationBarColor">@android:color/transparent</item>
	<item name="android:statusBarColor">@android:color/transparent</item>		<item name="android:statusBarColor">@android:color/transparent</item>
			<item name="colorControlNormal">?android:attr/colorControlNormal</item>
			<!-- For AndroidX AlertDialog -->
			<item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib</item>
			</style>

			<style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
			<item name="colorAccent">@*android:color/accent_device_default_light</item>
			<item name="android:colorError">@color/settingslib_dialog_colorError</item>
			<item name="android:colorBackground">@color/settingslib_dialog_background</item>

			<item name="android:windowSoftInputMode">adjustResize</item>
			<item name="android:clipToPadding">true</item>
			<item name="android:clipChildren">true</item>

			<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
	</style>		</style>
	</resources>		</resources>
			No newline at end of file

packages/SettingsLib/SettingsTheme/res/values/themes.xml

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,5 +26,19 @@
	<!-- Suppress the built-in action bar -->		<!-- Suppress the built-in action bar -->
	<item name="android:windowActionBar">false</item>		<item name="android:windowActionBar">false</item>
	<item name="android:windowNoTitle">true</item>		<item name="android:windowNoTitle">true</item>
			<item name="colorControlNormal">?android:attr/colorControlNormal</item>
			<!-- For AndroidX AlertDialog -->
			<item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib</item>
			</style>

			<style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
			<!-- TODO(b/189308264): fix the crash in Android R if set the attributes:
			<item name="colorAccent">@*android:color/accent_device_default_light</item>
			<item name="android:colorBackground">@color/settingslib_dialog_background</item>
			<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
			-->
			<item name="android:windowSoftInputMode">adjustResize</item>
			<item name="android:clipToPadding">true</item>
			<item name="android:clipChildren">true</item>
	</style>		</style>
	</resources>		</resources>