Update text field tokens.
Placeholders now have a dedicated token value in the
enabled state, and should be the same as the input text in
the disabled state.
Test: n/a (functionally no behaviorial changes)
Change-Id: Ibbcc3acfb2761ded47326b7fc571c2896fbc0c1b
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/TextFieldDefaults.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/TextFieldDefaults.kt
index 827e5bc..0b91d9d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/TextFieldDefaults.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/TextFieldDefaults.kt
@@ -333,9 +333,9 @@
disabledLabelColor: Color = FilledTextFieldTokens.DisabledLabelColor.toColor()
.copy(alpha = FilledTextFieldTokens.DisabledLabelOpacity),
errorLabelColor: Color = FilledTextFieldTokens.ErrorLabelColor.toColor(),
- placeholderColor: Color = FilledTextFieldTokens.SupportingColor.toColor(),
- disabledPlaceholderColor: Color = FilledTextFieldTokens.DisabledSupportingColor.toColor()
- .copy(alpha = FilledTextFieldTokens.DisabledSupportingOpacity)
+ placeholderColor: Color = FilledTextFieldTokens.InputPlaceholderColor.toColor(),
+ disabledPlaceholderColor: Color = FilledTextFieldTokens.DisabledInputColor.toColor()
+ .copy(alpha = FilledTextFieldTokens.DisabledInputOpacity)
): TextFieldColors =
DefaultTextFieldColors(
textColor = textColor,
@@ -396,9 +396,9 @@
disabledLabelColor: Color = OutlinedTextFieldTokens.DisabledLabelColor.toColor()
.copy(alpha = OutlinedTextFieldTokens.DisabledLabelOpacity),
errorLabelColor: Color = OutlinedTextFieldTokens.ErrorLabelColor.toColor(),
- placeholderColor: Color = OutlinedTextFieldTokens.SupportingColor.toColor(),
- disabledPlaceholderColor: Color = OutlinedTextFieldTokens.DisabledSupportingColor.toColor()
- .copy(alpha = OutlinedTextFieldTokens.DisabledSupportingOpacity)
+ placeholderColor: Color = OutlinedTextFieldTokens.InputPlaceholderColor.toColor(),
+ disabledPlaceholderColor: Color = OutlinedTextFieldTokens.DisabledInputColor.toColor()
+ .copy(alpha = OutlinedTextFieldTokens.DisabledInputOpacity)
): TextFieldColors =
DefaultTextFieldColors(
textColor = textColor,
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTextFieldTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTextFieldTokens.kt
index d1c8d85..ab2535d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTextFieldTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTextFieldTokens.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// VERSION: v0_77
+// VERSION: v0_89
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -79,6 +79,9 @@
val HoverTrailingIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
val InputColor = ColorSchemeKeyTokens.OnSurface
val InputFont = TypographyKeyTokens.BodyLarge
+ val InputPlaceholderColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val InputPrefixColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val InputSuffixColor = ColorSchemeKeyTokens.OnSurfaceVariant
val LabelColor = ColorSchemeKeyTokens.OnSurfaceVariant
val LabelFont = TypographyKeyTokens.BodyLarge
val LeadingIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedTextFieldTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedTextFieldTokens.kt
index e30ad72..905b134 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedTextFieldTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedTextFieldTokens.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// VERSION: v0_77
+// VERSION: v0_89
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -72,6 +72,9 @@
val HoverTrailingIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
val InputColor = ColorSchemeKeyTokens.OnSurface
val InputFont = TypographyKeyTokens.BodyLarge
+ val InputPlaceholderColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val InputPrefixColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val InputSuffixColor = ColorSchemeKeyTokens.OnSurfaceVariant
val LabelColor = ColorSchemeKeyTokens.OnSurfaceVariant
val LabelFont = TypographyKeyTokens.BodyLarge
val LeadingIconColor = ColorSchemeKeyTokens.OnSurfaceVariant