summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Etchebehere <santie@google.com> 2022-02-03 17:44:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-02-03 17:44:04 +0000
commitee754300bfdfbb93b4829fe4861d67a6b6fd2142 (patch)
tree2b0548f88e8c9ba165362db079e888d8ae9fdd49
parent8b869af3560d3e92e5ffee0c3bb58ad5b78d75be (diff)
parentc8fde7c59f69a221dcb3118b6ed10fa45836b756 (diff)
Merge "Add new ColorScheme styles"
-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(