From 47e0803c71ac0cddc6fd7b891d24f5e5585f3c22 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Fri, 26 May 2023 07:43:25 -0700
Subject: [PATCH] Fix contrast of monochrome fixed colors

Screenshots:
https://screenshot.googleplex.com/4ddevTXDQpRwWPA https://screenshot.googleplex.com/8T4HVfrHHsR9cSD
https://screenshot.googleplex.com/7Wp7k5njCE33n3z
https://screenshot.googleplex.com/7Np6gEXU7utJFsm

Bug: 282951509
Test: atest SystemPaletteTest
Change-Id: I678aea8a09c7b9cf30b437f15c4518415e3de319
---
 .../monet/dynamiccolor/MaterialDynamicColors.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java b/packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java
index bc1edee1c10b7..9f075e5211263 100644
--- a/packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java
+++ b/packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java
@@ -410,7 +410,7 @@ public final class MaterialDynamicColors {
                 (s) -> s.primaryPalette,
                 (s) -> {
                     if (isMonochrome(s)) {
-                        return s.isDark ? 100.0 : 10.0;
+                        return 40.0;
                     }
                     return 90.0;
                 },
@@ -423,7 +423,7 @@ public final class MaterialDynamicColors {
                 (s) -> s.primaryPalette,
                 (s) -> {
                     if (isMonochrome(s)) {
-                        return s.isDark ? 90.0 : 20.0;
+                        return 30.0;
                     }
                     return 80.0;
                 },
@@ -436,7 +436,7 @@ public final class MaterialDynamicColors {
                 (s) -> s.primaryPalette,
                 (s) -> {
                     if (isMonochrome(s)) {
-                        return s.isDark ? 10.0 : 90.0;
+                        return 100.0;
                     }
                     return 10.0;
                 },
@@ -449,7 +449,7 @@ public final class MaterialDynamicColors {
                 (s) -> s.primaryPalette,
                 (s) -> {
                     if (isMonochrome(s)) {
-                        return s.isDark ? 30.0 : 70.0;
+                        return 90.0;
                     }
                     return 30.0;
                 },
@@ -497,13 +497,13 @@ public final class MaterialDynamicColors {
     @NonNull
     public DynamicColor onTertiaryFixed() {
         return DynamicColor.fromPalette(
-                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 90.0 : 10.0, (s) -> tertiaryFixedDim());
+                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 100.0 : 10.0, (s) -> tertiaryFixedDim());
     }
 
     @NonNull
     public DynamicColor onTertiaryFixedVariant() {
         return DynamicColor.fromPalette(
-                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 70.0 : 30.0, (s) -> tertiaryFixedDim());
+                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 90.0 : 30.0, (s) -> tertiaryFixedDim());
     }
 
     /**