diff options
| author | Marcelo Arteiro <arteiro@google.com> | 2022-11-08 16:49:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-11-08 16:49:48 +0000 |
| commit | f2ca29fa0018584f33f68af60d10838bcbb348aa (patch) | |
| tree | 4602eb06c6b8a37f20b550abb7add714195446e5 /src/com/android | |
| parent | 364bd9d275ba7b8e6583dc70ac4a01c9420501bd (diff) | |
| parent | 87c41eb74a8d2760130b76117ba261cf2613f696 (diff) | |
| download | ThemePicker-f2ca29fa0018584f33f68af60d10838bcbb348aa.tar.gz | |
Merge "Monochromatic Theme on ThemePicker" into tm-qpr-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/customization/model/color/ColorProvider.kt | 10 |
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 = |