childChipColors should also set a transparent disabledBackgroundColor [238057342]

Fixed

Bug

Status Update

No update yet.

Description

di...@gmail.com

created issue #1

Jul 6, 2022 02:31AM

Component used: androidx.wear.compose:compose-material Version used: 1.0.0-rc02 Devices/Android versions reproduced on: All

Chip.kt childChipColors intends for the background to be transparent, but the disabled state overrides the alpha value, causing the background to appear a dark black instead of transparent.

Chip.kt childChipColors contains this code:

@Composable
    public fun childChipColors(
        contentColor: Color = MaterialTheme.colors.onSurface,
        secondaryContentColor: Color = contentColor,
        iconColor: Color = contentColor
    ): ChipColors {
        return chipColors(
            backgroundColor = Color.Transparent,
            contentColor = contentColor,
            secondaryContentColor = secondaryContentColor,
            iconColor = iconColor
        )
    }

It should also override disabledBackgroundColor, also setting it to Color.Transparent. The default is disabledBackgroundColor: Color = backgroundColor.copy(alpha = ContentAlpha.disabled), which results in a dark black background for the chip.

Comments

jn...@google.com <jn...@google.com> Jul 12, 2022 11:08AM

Assigned to jn...@google.com.

jn...@google.com <jn...@google.com> #2Jul 12, 2022 01:48PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

jn...@google.com <jn...@google.com> #3Jul 13, 2022 11:09AM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

jn...@google.com <jn...@google.com> #4Jul 13, 2022 11:09AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

Screenshot_20220713_115935.png

35 KB

View

Download

jn...@google.com <jn...@google.com> Jul 13, 2022 01:20PM

Accepted by jn...@google.com.

di...@gmail.com <di...@gmail.com> #5Jul 13, 2022 01:55PM

I agree, the behaviour was not intuitive to me either. Another way could be applying min(background.alpha, disabled.alpha) in chipColors() but that would have a much wider impact.

Thank you for the fix!

ap...@google.com <ap...@google.com> #6Jul 13, 2022 02:58PM

Project: platform/frameworks/support
Branch: androidx-main

commit ff6fae95f64c40e7d75bfc0180d940dff28556fa
Author: John Nichol <jnichol@google.com>
Date: Wed Jul 13 14:19:51 2022

Explicitly set the disabledBackgroundColor for Chip childChipColors

Bug: 238057342

Test: ./gradlew :wear:compose:compose-material:connectedCheck --info --daemon
RelNote: "Fixed a bug in the ChipDefaults.childChipColor() to ensure that the disabled background color is full transparent."
Change-Id: I2b3c3ffdf046b9202e56411160ad41a51a1c6fb7

M wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ChipTest.kt
M wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt

https://android-review.googlesource.com/2152756

jn...@google.com <jn...@google.com> Jul 14, 2022 09:16AM

Marked as fixed.