diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-30 13:42:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-30 13:42:21 +0000 |
| commit | c4def3e4b7074376560cbb3092bee36222dfc029 (patch) | |
| tree | 9f89bf4085db92a7f24e89e37cdde64b9e86d35c | |
| parent | 273acf83ad934d815db8290cee872e3e8376be37 (diff) | |
| parent | 69dbc8a5a3a4fc82d8f46c8207a91525891fbb49 (diff) | |
| download | support-c4def3e4b7074376560cbb3092bee36222dfc029.tar.gz | |
Merge "Merge cherrypicks of ['android-review.googlesource.com/2597166', 'android-review.googlesource.com/2597106'] into androidx-compose-beta-release." into androidx-compose-beta-release
2 files changed, 4 insertions, 6 deletions
diff --git a/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/ToggleChip.kt b/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/ToggleChip.kt index 3959dbc7581..0343958442b 100644 --- a/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/ToggleChip.kt +++ b/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/ToggleChip.kt @@ -93,7 +93,7 @@ import androidx.compose.ui.unit.dp * guide. * * @param checked Boolean flag indicating whether this button is currently checked. - * @param onCheckedChange Callback to be invoked when this buttons checked/selected status is + * @param onCheckedChange Callback to be invoked when this buttons checked/selected status changes * @param label A slot for providing the chip's main label. The contents are expected to be text * which is "start" aligned. * @param toggleControl A slot for providing the chip's toggle controls(s). The contents are diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/TextButton.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/TextButton.kt index e3c916acf34..6c9e8b7d20b 100644 --- a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/TextButton.kt +++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/TextButton.kt @@ -178,12 +178,10 @@ object TextButtonDefaults { fun textButtonColors( containerColor: Color = Color.Transparent, contentColor: Color = MaterialTheme.colorScheme.onBackground, - disabledContainerColor: Color = MaterialTheme.colorScheme.onSurface.copy( - alpha = DisabledBorderAndContainerAlpha + disabledContainerColor: Color = MaterialTheme.colorScheme.onSurface.toDisabledColor( + disabledAlpha = DisabledBorderAndContainerAlpha ), - disabledContentColor: Color = MaterialTheme.colorScheme.onSurface.copy( - alpha = ContentAlpha.disabled - ) + disabledContentColor: Color = MaterialTheme.colorScheme.onSurface.toDisabledColor() ): TextButtonColors = TextButtonColors( containerColor = containerColor, contentColor = contentColor, |