summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marcus Ge <marcusge@google.com> 2024-03-21 20:03:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-21 20:03:00 +0000
commitb2418a2e6e5ebb79a09efcf31b552cc7e711e3f1 (patch)
treecb9b7cc85dd0673ddbd8b6c566ea3a6e6a71a99c
parent6045eeb48f428468a485007b8644617a549c24ed (diff)
parent0fb6b32428a536ad0275dfaa01517a646d80a391 (diff)
Merge "[Settings] Update component color to respect contrast in v34+" into main
-rw-r--r--packages/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml4
-rw-r--r--packages/SettingsLib/SettingsTheme/res/values-v34/colors.xml4
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml
index e3645b55981b..beed90efb508 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml
@@ -37,4 +37,8 @@
<!-- Material next track off color-->
<color name="settingslib_track_off_color">@android:color/system_surface_container_highest_dark
</color>
+
+ <color name="settingslib_text_color_primary_device_default">@android:color/system_on_surface_dark</color>
+
+ <color name="settingslib_text_color_secondary_device_default">@android:color/system_on_surface_variant_dark</color>
</resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v34/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v34/colors.xml
index fdd96ec78efc..3709b5d13056 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v34/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v34/colors.xml
@@ -39,4 +39,8 @@
<!-- Material next track outline color-->
<color name="settingslib_track_online_color">@color/settingslib_switch_track_outline_color</color>
+
+ <color name="settingslib_text_color_primary_device_default">@android:color/system_on_surface_light</color>
+
+ <color name="settingslib_text_color_secondary_device_default">@android:color/system_on_surface_variant_light</color>
</resources> \ No newline at end of file