summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorMarcelo Arteiro <arteiro@google.com>2022-11-02 09:44:05 +0000
committerMarcelo Arteiro <arteiro@google.com>2022-11-07 16:08:47 +0000
commit87c41eb74a8d2760130b76117ba261cf2613f696 (patch)
treea2992a1d166621333e519be78972809de0bb1e91 /src/com/android
parent23383f621da9fae1fc270e5f27435f164bbff310 (diff)
downloadThemePicker-87c41eb74a8d2760130b76117ba261cf2613f696.tar.gz
Monochromatic Theme on ThemePicker
Added Monochromatic Theme option guarded by System Property Flag Screenshot https://screenshot.googleplex.com/3GAAPFXfMBkxF2t Test: Manual Bug: 241778903 Change-Id: I322b2fa36f479f5583e736cb0610ca731fe9bc30
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/customization/model/color/ColorProvider.kt10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index 814a963f..c1a45527 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -37,6 +37,7 @@ import com.android.customization.model.color.ColorUtils.toColorString
import com.android.systemui.monet.ColorScheme
import com.android.systemui.monet.Style
import com.android.wallpaper.compat.WallpaperManagerCompat
+import com.android.wallpaper.config.Flags
import com.android.wallpaper.module.InjectorProvider
import java.util.*
import kotlinx.coroutines.CoroutineScope
@@ -246,6 +247,11 @@ class ColorProvider(context: Context, stubPackageName: String) :
return when (this.style) {
Style.FRUIT_SALAD -> intArrayOf(seed, this.accent1[2])
Style.TONAL_SPOT -> intArrayOf(this.accentColor, this.accentColor)
+ Style.MONOCHROMATIC ->
+ intArrayOf(
+ setAlphaComponent(0x000000, 255),
+ setAlphaComponent(0xFFFFFF, 255),
+ )
else -> intArrayOf(this.accent1[2], this.accent1[2])
}
}
@@ -281,6 +287,10 @@ class ColorProvider(context: Context, stubPackageName: String) :
Style.TONAL_SPOT
}
+ if (style == Style.MONOCHROMATIC && !Flags.isMonochromaticFlagEnabled) {
+ continue
+ }
+
val darkColors =
ColorScheme(colorFromStub, true, style).getPresetColorPreview(colorFromStub)
val lightColors =