No public description
PiperOrigin-RevId: 816807975
diff --git a/kotlin/dynamiccolor/ColorSpec.kt b/kotlin/dynamiccolor/ColorSpec.kt
index 8aea199..1af7768 100644
--- a/kotlin/dynamiccolor/ColorSpec.kt
+++ b/kotlin/dynamiccolor/ColorSpec.kt
@@ -173,25 +173,6 @@
fun onTertiaryFixedVariant(): DynamicColor
// ////////////////////////////////////////////////////////////////
- // Android-only Colors //
- // ////////////////////////////////////////////////////////////////
- fun controlActivated(): DynamicColor
-
- fun controlNormal(): DynamicColor
-
- fun controlHighlight(): DynamicColor
-
- fun textPrimaryInverse(): DynamicColor
-
- fun textSecondaryAndTertiaryInverse(): DynamicColor
-
- fun textPrimaryInverseDisableOnly(): DynamicColor
-
- fun textSecondaryAndTertiaryInverseDisabled(): DynamicColor
-
- fun textHintInverse(): DynamicColor
-
- // ////////////////////////////////////////////////////////////////
// Other //
// ////////////////////////////////////////////////////////////////
fun highestSurface(s: DynamicScheme): DynamicColor
diff --git a/kotlin/dynamiccolor/ColorSpec2021.kt b/kotlin/dynamiccolor/ColorSpec2021.kt
index dd1e7cc..446db9d 100644
--- a/kotlin/dynamiccolor/ColorSpec2021.kt
+++ b/kotlin/dynamiccolor/ColorSpec2021.kt
@@ -777,105 +777,6 @@
}
// ////////////////////////////////////////////////////////////////
- // Android-only Colors //
- // ////////////////////////////////////////////////////////////////
- /**
- * These colors were present in Android framework before Android U, and used by MDC controls. They
- * should be avoided, if possible. It's unclear if they're used on multiple backgrounds, and if
- * they are, they can't be adjusted for contrast.* For now, they will be set with no background,
- * and those won't adjust for contrast, avoiding issues.
- * * For example, if the same color is on a white background _and_ black background, there's no
- * way to increase contrast with either without losing contrast with the other.
- */
- // colorControlActivated documented as colorAccent in M3 & GM3.
- // colorAccent documented as colorSecondary in M3 and colorPrimary in GM3.
- // Android used Material's Container as Primary/Secondary/Tertiary at launch.
- // Therefore, this is a duplicated version of Primary Container.
- override fun controlActivated(): DynamicColor {
- return DynamicColor.Builder()
- .setName("control_activated")
- .setPalette { s: DynamicScheme -> s.primaryPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 30.0 else 90.0 }
- .setIsBackground(true)
- .build()
- }
-
- // colorControlNormal documented as textColorSecondary in M3 & GM3.
- // In Material, textColorSecondary points to onSurfaceVariant in the non-disabled state,
- // which is Neutral Variant T30/80 in light/dark.
- override fun controlNormal(): DynamicColor {
- return DynamicColor.Builder()
- .setName("control_normal")
- .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 80.0 else 30.0 }
- .build()
- }
-
- // colorControlHighlight documented, in both M3 & GM3:
- // Light mode: #1f000000 dark mode: #33ffffff.
- // These are black and white with some alpha.
- // 1F hex = 31 decimal; 31 / 255 = 12% alpha.
- // 33 hex = 51 decimal; 51 / 255 = 20% alpha.
- // DynamicColors do not support alpha currently, and _may_ not need it for this use case,
- // depending on how MDC resolved alpha for the other cases.
- // Returning black in dark mode, white in light mode.
- override fun controlHighlight(): DynamicColor {
- return DynamicColor.Builder()
- .setName("control_highlight")
- .setPalette { s: DynamicScheme -> s.neutralPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 100.0 else 0.0 }
- .setOpacity { s: DynamicScheme -> if (s.isDark) 0.20 else 0.12 }
- .build()
- }
-
- // textColorPrimaryInverse documented, in both M3 & GM3, documented as N10/N90.
- override fun textPrimaryInverse(): DynamicColor {
- return DynamicColor.Builder()
- .setName("text_primary_inverse")
- .setPalette { s: DynamicScheme -> s.neutralPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 10.0 else 90.0 }
- .build()
- }
-
- // textColorSecondaryInverse and textColorTertiaryInverse both documented, in both M3 & GM3, as
- // NV30/NV80
- override fun textSecondaryAndTertiaryInverse(): DynamicColor {
- return DynamicColor.Builder()
- .setName("text_secondary_and_tertiary_inverse")
- .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 30.0 else 80.0 }
- .build()
- }
-
- // textColorPrimaryInverseDisableOnly documented, in both M3 & GM3, as N10/N90
- override fun textPrimaryInverseDisableOnly(): DynamicColor {
- return DynamicColor.Builder()
- .setName("text_primary_inverse_disable_only")
- .setPalette { s: DynamicScheme -> s.neutralPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 10.0 else 90.0 }
- .build()
- }
-
- // textColorSecondaryInverse and textColorTertiaryInverse in disabled state both documented,
- // in both M3 & GM3, as N10/N90
- override fun textSecondaryAndTertiaryInverseDisabled(): DynamicColor {
- return DynamicColor.Builder()
- .setName("text_secondary_and_tertiary_inverse_disabled")
- .setPalette { s: DynamicScheme -> s.neutralPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 10.0 else 90.0 }
- .build()
- }
-
- // textColorHintInverse documented, in both M3 & GM3, as N10/N90
- override fun textHintInverse(): DynamicColor {
- return DynamicColor.Builder()
- .setName("text_hint_inverse")
- .setPalette { s: DynamicScheme -> s.neutralPalette }
- .setTone { s: DynamicScheme -> if (s.isDark) 10.0 else 90.0 }
- .build()
- }
-
- // ////////////////////////////////////////////////////////////////
// Other //
// ////////////////////////////////////////////////////////////////
override fun highestSurface(s: DynamicScheme): DynamicColor {
diff --git a/kotlin/dynamiccolor/ColorSpec2025.kt b/kotlin/dynamiccolor/ColorSpec2025.kt
index 91d4621..9376758 100644
--- a/kotlin/dynamiccolor/ColorSpec2025.kt
+++ b/kotlin/dynamiccolor/ColorSpec2025.kt
@@ -1466,36 +1466,6 @@
}
// ////////////////////////////////////////////////////////////////
- // Android-only Colors //
- // ////////////////////////////////////////////////////////////////
- override fun controlActivated(): DynamicColor {
- // Remapped to primaryContainer for 2025 spec.
- val color2025 = primaryContainer().toBuilder().setName("control_activated").build()
- return super.controlActivated()
- .toBuilder()
- .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
- .build()
- }
-
- override fun controlNormal(): DynamicColor {
- // Remapped to onSurfaceVariant for 2025 spec.
- val color2025 = onSurfaceVariant().toBuilder().setName("control_normal").build()
- return super.controlNormal()
- .toBuilder()
- .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
- .build()
- }
-
- override fun textPrimaryInverse(): DynamicColor {
- // Remapped to inverseOnSurface for 2025 spec.
- val color2025 = inverseOnSurface().toBuilder().setName("text_primary_inverse").build()
- return super.textPrimaryInverse()
- .toBuilder()
- .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
- .build()
- }
-
- // ////////////////////////////////////////////////////////////////
// Other //
// ////////////////////////////////////////////////////////////////
private fun findBestToneForChroma(
diff --git a/kotlin/dynamiccolor/DynamicScheme.kt b/kotlin/dynamiccolor/DynamicScheme.kt
index c6c6ddb..16fcd56 100644
--- a/kotlin/dynamiccolor/DynamicScheme.kt
+++ b/kotlin/dynamiccolor/DynamicScheme.kt
@@ -237,30 +237,6 @@
val onTertiaryFixedVariant: Int
get() = getArgb(MaterialDynamicColors().onTertiaryFixedVariant())
- val controlActivated: Int
- get() = getArgb(MaterialDynamicColors().controlActivated())
-
- val controlNormal: Int
- get() = getArgb(MaterialDynamicColors().controlNormal())
-
- val controlHighlight: Int
- get() = getArgb(MaterialDynamicColors().controlHighlight())
-
- val textPrimaryInverse: Int
- get() = getArgb(MaterialDynamicColors().textPrimaryInverse())
-
- val textSecondaryAndTertiaryInverse: Int
- get() = getArgb(MaterialDynamicColors().textSecondaryAndTertiaryInverse())
-
- val textPrimaryInverseDisableOnly: Int
- get() = getArgb(MaterialDynamicColors().textPrimaryInverseDisableOnly())
-
- val textSecondaryAndTertiaryInverseDisabled: Int
- get() = getArgb(MaterialDynamicColors().textSecondaryAndTertiaryInverseDisabled())
-
- val textHintInverse: Int
- get() = getArgb(MaterialDynamicColors().textHintInverse())
-
companion object {
val DEFAULT_SPEC_VERSION = SpecVersion.SPEC_2021
val DEFAULT_PLATFORM = Platform.PHONE
diff --git a/kotlin/dynamiccolor/MaterialDynamicColors.kt b/kotlin/dynamiccolor/MaterialDynamicColors.kt
index 8d0e009..dd6eb9d 100644
--- a/kotlin/dynamiccolor/MaterialDynamicColors.kt
+++ b/kotlin/dynamiccolor/MaterialDynamicColors.kt
@@ -287,71 +287,6 @@
}
// ////////////////////////////////////////////////////////////////
- // Android-only colors //
- // ////////////////////////////////////////////////////////////////
- /**
- * These colors were present in Android framework before Android U, and used by MDC controls. They
- * should be avoided, if possible. It's unclear if they're used on multiple backgrounds, and if
- * they are, they can't be adjusted for contrast.* For now, they will be set with no background,
- * and those won't adjust for contrast, avoiding issues.
- * * For example, if the same color is on a white background _and_ black background, there's no
- * way to increase contrast with either without losing contrast with the other.
- */
- // colorControlActivated documented as colorAccent in M3 & GM3.
- // colorAccent documented as colorSecondary in M3 and colorPrimary in GM3.
- // Android used Material's Container as Primary/Secondary/Tertiary at launch.
- // Therefore, this is a duplicated version of Primary Container.
- fun controlActivated(): DynamicColor {
- return colorSpec.controlActivated()
- }
-
- // colorControlNormal documented as textColorSecondary in M3 & GM3.
- // In Material, textColorSecondary points to onSurfaceVariant in the non-disabled state,
- // which is Neutral Variant T30/80 in light/dark.
- fun controlNormal(): DynamicColor {
- return colorSpec.controlNormal()
- }
-
- // colorControlHighlight documented, in both M3 & GM3:
- // Light mode: #1f000000 dark mode: #33ffffff.
- // These are black and white with some alpha.
- // 1F hex = 31 decimal; 31 / 255 = 12% alpha.
- // 33 hex = 51 decimal; 51 / 255 = 20% alpha.
- // DynamicColors do not support alpha currently, and _may_ not need it for this use case,
- // depending on how MDC resolved alpha for the other cases.
- // Returning black in dark mode, white in light mode.
- fun controlHighlight(): DynamicColor {
- return colorSpec.controlHighlight()
- }
-
- // textColorPrimaryInverse documented, in both M3 & GM3, documented as N10/N90.
- fun textPrimaryInverse(): DynamicColor {
- return colorSpec.textPrimaryInverse()
- }
-
- // textColorSecondaryInverse and textColorTertiaryInverse both documented, in both M3 & GM3, as
- // NV30/NV80
- fun textSecondaryAndTertiaryInverse(): DynamicColor {
- return colorSpec.textSecondaryAndTertiaryInverse()
- }
-
- // textColorPrimaryInverseDisableOnly documented, in both M3 & GM3, as N10/N90
- fun textPrimaryInverseDisableOnly(): DynamicColor {
- return colorSpec.textPrimaryInverseDisableOnly()
- }
-
- // textColorSecondaryInverse and textColorTertiaryInverse in disabled state both documented,
- // in both M3 & GM3, as N10/N90
- fun textSecondaryAndTertiaryInverseDisabled(): DynamicColor {
- return colorSpec.textSecondaryAndTertiaryInverseDisabled()
- }
-
- // textColorHintInverse documented, in both M3 & GM3, as N10/N90
- fun textHintInverse(): DynamicColor {
- return colorSpec.textHintInverse()
- }
-
- // ////////////////////////////////////////////////////////////////
// All Colors //
// ////////////////////////////////////////////////////////////////
/** All dynamic colors in Material Design system. */
@@ -416,14 +351,6 @@
this::onError,
this::errorContainer,
this::onErrorContainer,
- this::controlActivated,
- this::controlNormal,
- this::controlHighlight,
- this::textPrimaryInverse,
- this::textSecondaryAndTertiaryInverse,
- this::textPrimaryInverseDisableOnly,
- this::textSecondaryAndTertiaryInverseDisabled,
- this::textHintInverse,
)
}
}
