Merge "Merge cherrypicks of ['android-review.googlesource.com/2986771'] into androidx-compose-material3-release." into androidx-compose-material3-releaseandroidx-compose-material3-release

1 files changed, 5 insertions, 7 deletions

diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
index 3f19f2dcdc1..2b9e035866d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
@@ -664,7 +664,7 @@ object ButtonDefaults {
                 disabledContentColor = fromToken(FilledTonalButtonTokens.DisabledLabelTextColor)
                     .copy(alpha = FilledTonalButtonTokens.DisabledLabelTextOpacity)
             ).also {
-                defaultElevatedButtonColorsCached = it
+                defaultFilledTonalButtonColorsCached = it
             }
         }
 
@@ -728,12 +728,10 @@ object ButtonDefaults {
      */
     @Composable
     fun textButtonColors(
-        containerColor: Color = Color.Transparent,
-        contentColor: Color = TextButtonTokens.LabelTextColor.value,
-        disabledContainerColor: Color = Color.Transparent,
-        disabledContentColor: Color = TextButtonTokens.DisabledLabelTextColor
-            .value
-            .copy(alpha = TextButtonTokens.DisabledLabelTextOpacity),
+        containerColor: Color = Color.Unspecified,
+        contentColor: Color = Color.Unspecified,
+        disabledContainerColor: Color = Color.Unspecified,
+        disabledContentColor: Color = Color.Unspecified,
     ): ButtonColors = MaterialTheme.colorScheme.defaultTextButtonColors.copy(
         containerColor = containerColor,
         contentColor = contentColor,