diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 15:38:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-06-20 15:38:37 +0000 |
| commit | 758cff6dd9567143b0eb55946c368015eaf758d0 (patch) | |
| tree | 9a27de5d19af96bc349e8e6b9f1777ee7c05dd8e | |
| parent | 6fc78ebb91f9f4faac8518a4bb85026e586f8418 (diff) | |
| parent | ffe7d5baab463bdb8681e27fb2f827227ab596b5 (diff) | |
| download | support-sparse-8745960-L82600000955177365.tar.gz | |
Merge "Merge cherrypicks of [2127904] into sparse-8745960-L82600000955177365." into sparse-8745960-L82600000955177365sparse-8745960-L82600000955177365
3 files changed, 5 insertions, 5 deletions
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt index 49a6128cf0a..7d61b5a4f6f 100644 --- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt +++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt @@ -379,10 +379,10 @@ public object CardDefaults { @Composable public fun cardBackgroundPainter( startBackgroundColor: Color = - MaterialTheme.colors.onSurfaceVariant.copy(alpha = 0.20f) + MaterialTheme.colors.primary.copy(alpha = 0.30f) .compositeOver(MaterialTheme.colors.background), endBackgroundColor: Color = - MaterialTheme.colors.onSurfaceVariant.copy(alpha = 0.10f) + MaterialTheme.colors.onSurfaceVariant.copy(alpha = 0.20f) .compositeOver(MaterialTheme.colors.background), gradientDirection: LayoutDirection = LocalLayoutDirection.current ): Painter { diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt index a7f83d01602..483a8916ff0 100644 --- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt +++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt @@ -479,7 +479,7 @@ public object ChipDefaults { */ @Composable public fun gradientBackgroundChipColors( - startBackgroundColor: Color = MaterialTheme.colors.primary.copy(alpha = 0.325f) + startBackgroundColor: Color = MaterialTheme.colors.primary.copy(alpha = 0.5f) .compositeOver(MaterialTheme.colors.surface), endBackgroundColor: Color = MaterialTheme.colors.surface.copy(alpha = 0f) .compositeOver(MaterialTheme.colors.surface), diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt index eda6db9fccd..7da5bcb95e2 100644 --- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt +++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt @@ -570,10 +570,10 @@ public object ToggleChipDefaults { @Composable public fun toggleChipColors( checkedStartBackgroundColor: Color = - MaterialTheme.colors.surface.copy(alpha = 0.75f) + MaterialTheme.colors.surface.copy(alpha = 0f) .compositeOver(MaterialTheme.colors.surface), checkedEndBackgroundColor: Color = - MaterialTheme.colors.primary.copy(alpha = 0.325f) + MaterialTheme.colors.primary.copy(alpha = 0.5f) .compositeOver(MaterialTheme.colors.surface), checkedContentColor: Color = MaterialTheme.colors.onSurface, checkedSecondaryContentColor: Color = MaterialTheme.colors.onSurfaceVariant, |