commit | 57057e11ae9676b675f4064bacc01e39215a0b97 | [log] [tgz] |
---|---|---|
author | Catherine Liang <cathliang@google.com> | Thu Apr 20 21:17:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 21:17:42 2023 +0000 |
tree | ea2621b77e5aa90e303043bdf8eeecf3d5109540 | |
parent | 7c58d5e5b59eecf067bd0f76bcbcba2a0c7f39d3 [diff] | |
parent | 7c35982a700fcfaf9430b4d215141993e390d736 [diff] |
Merge "Adjust basic Fruit Salad colors contrast" into udc-dev am: 7c35982a70 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/22649246 Change-Id: I8fbdedae2ca034ad9950b9ea0c67ed646642c5c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt index 6520b52..5ec919f 100644 --- a/src/com/android/customization/model/color/ColorProvider.kt +++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -348,7 +348,7 @@ private fun getRevampedUIPresetColorPreview(colorScheme: ColorScheme, seed: Int): IntArray { val colors = when (colorScheme.style) { - Style.FRUIT_SALAD -> intArrayOf(seed, colorScheme.accent1.s100) + Style.FRUIT_SALAD -> intArrayOf(seed, colorScheme.accent1.s200) Style.TONAL_SPOT -> intArrayOf(colorScheme.accentColor, colorScheme.accentColor) else -> intArrayOf(colorScheme.accent1.s100, colorScheme.accent1.s100) }