summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Etchebehere <santie@google.com> 2022-01-28 18:17:10 -0800
committer Santiago Etchebehere <santie@google.com> 2022-02-03 02:22:13 +0000
commitc8fde7c59f69a221dcb3118b6ed10fa45836b756 (patch)
tree6f652f85a2ccd2146dfc6ae4291210bc4c9885d0
parentf1be3163f5cb6586c366615b2f4d941ef51f4f70 (diff)
Add new ColorScheme styles
Bug: 202145221 Test: manual Change-Id: Ibaf5cd421380c4c38e2688ebe60216613d973b8f
-rw-r--r--packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt14
1 files changed, 14 insertions, 0 deletions
diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
index 29221aa04699..208825ccc8cf 100644
--- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
+++ b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
@@ -103,6 +103,20 @@ enum class Style(internal val coreSpec: CoreSpec) {
n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0)),
n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 32.0))
)),
+ RAINBOW(CoreSpec(
+ a1 = TonalSpec(chroma = Chroma(ChromaStrategy.GTE, 48.0)),
+ a2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0)),
+ a3 = TonalSpec(Hue(HueStrategy.ADD, 60.0), Chroma(ChromaStrategy.EQ, 24.0)),
+ n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 0.0)),
+ n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 0.0))
+ )),
+ FRUIT_SALAD(CoreSpec(
+ a1 = TonalSpec(Hue(HueStrategy.SUBTRACT, 50.0), Chroma(ChromaStrategy.GTE, 48.0)),
+ a2 = TonalSpec(Hue(HueStrategy.SUBTRACT, 50.0), Chroma(ChromaStrategy.EQ, 36.0)),
+ a3 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 36.0)),
+ n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 10.0)),
+ n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0))
+ )),
}
class ColorScheme(