vendor: themes: add quick settings theme
-dark/light system ui colors are now defined by theme
Change-Id: Ieb60333dabf74b7d54eaa1c81722e552fb81eeb4
diff --git a/google/themes/Bl4ckAndYell0/res/values/themes.xml b/google/themes/Bl4ckAndYell0/res/values/themes.xml
index 7271f92..252c2f1 100644
--- a/google/themes/Bl4ckAndYell0/res/values/themes.xml
+++ b/google/themes/Bl4ckAndYell0/res/values/themes.xml
@@ -336,32 +336,33 @@
<item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
</style>
-<!--
<style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
- <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
- <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
- <item name="android:textColorPrimary">#FFFFFDE7</item>
- <item name="android:textColorSecondary">#b3FFFDE7</item>
- <item name="android:textColorTertiary">#a0FFFDE7</item>
- <item name="android:textColorHint">#ffF57F17</item>
- <item name="android:textColorAlertDialogListItem">#FFFFFDE7</item>
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff29282c</item>
</style>
- <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Light.Dialog">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
- <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
- <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:textColorPrimary">#FFFFFDE7</item>
- <item name="android:textColorSecondary">#b3FFFDE7</item>
- <item name="android:textColorTertiary">#a0FFFDE7</item>
- <item name="android:textColorHint">#ffF57F17</item>
- <item name="android:textColorAlertDialogListItem">#FFFFFDE7</item>
+ <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff29282c</item>
</style>
--->
+
+ <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff29282c</item>
+ </style>
+
<!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
<style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
<!-- Color palette -->
@@ -462,6 +463,9 @@
<item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
</style>
+ <style name="Theme.DeviceDefault.InputMethod" parent="@*android:style/Theme.Material.InputMethod">
+ <item name="android:textColorAlertDialogListItem">#FFFFFDE7</item>
+ </style>
<!-- @hide Theme overlay that inherits from material actionbar, and use accent color for
primary text -->
diff --git a/google/themes/DarknessMeister/res/values/themes.xml b/google/themes/DarknessMeister/res/values/themes.xml
index 5be6635..7dbe5f1 100644
--- a/google/themes/DarknessMeister/res/values/themes.xml
+++ b/google/themes/DarknessMeister/res/values/themes.xml
@@ -336,33 +336,33 @@
</style>
-<!--
<style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
<item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+ <item name="android:colorBackgroundFloating">#ff222a33</item>
</style>
- <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Light.Dialog">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+ <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff222a33</item>
+ </style>
+
+ <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff222a33</item>
</style>
--->
+
<!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
<style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
<!-- Color palette -->
diff --git a/google/themes/SluttyPink/res/values/themes.xml b/google/themes/SluttyPink/res/values/themes.xml
index dd9be35..979127d 100644
--- a/google/themes/SluttyPink/res/values/themes.xml
+++ b/google/themes/SluttyPink/res/values/themes.xml
@@ -336,18 +336,12 @@
</style>
-<!--
<style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
<item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
<item name="android:colorBackgroundFloating">#ff182a33</item>
</style>
@@ -356,28 +350,18 @@
<item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
- <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ </style>
+
+ <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
<item name="android:colorBackgroundFloating">#ff182a33</item>
</style>
- <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Light.Dialog">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
- <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
- <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
- </style>
--->
<!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
<style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
<!-- Color palette -->
diff --git a/google/themes/SmokedGreen/res/values/themes.xml b/google/themes/SmokedGreen/res/values/themes.xml
index efbe4c0..6b234b4 100644
--- a/google/themes/SmokedGreen/res/values/themes.xml
+++ b/google/themes/SmokedGreen/res/values/themes.xml
@@ -336,33 +336,33 @@
</style>
-<!--
<style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
<item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+ <item name="android:colorBackgroundFloating">#ff373c37</item>
</style>
- <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Light.Dialog">
- <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+ <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+ <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+ <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff373c37</item>
+ </style>
+
+ <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+ <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
<item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
- <item name="android:textColorPrimary">#ffffffff</item>
- <item name="android:textColorSecondary">#fff5f5f5</item>
- <item name="android:textColorTertiary">#b3f5f5f5</item>
- <item name="android:textColorHint">#ff999999</item>
- <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+ <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
+ <item name="android:colorBackgroundFloating">#ff373c37</item>
</style>
--->
+
<!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
<style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
<!-- Color palette -->