Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4aa4247 authored by Tianfan Zhang's avatar Tianfan Zhang
Browse files

Delete colorFilter to fix blank icon bug. 

Bug: 419108176
Bug: 419425932
Test: atest ChipScreenshotTest
Test: atest NavBarPillScreenshotTest
Test: ShortPillScreenshotTest
Flag: com.android.systemui.enable_underlay
Change-Id: I7b052d54ca952782e5e457b30b1a90ec26860c6a
parent ddb4d87d

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/Chip.kt

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.alpha

import androidx.compose.ui.draw.clip

import androidx.compose.ui.graphics.ColorFilter

import androidx.compose.ui.unit.dp

import com.android.compose.ui.graphics.painter.rememberDrawablePainter

import com.android.systemui.ambientcue.ui.viewmodel.ActionViewModel
@@ -55,7 +54,6 @@ fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) { 
        val painter = rememberDrawablePainter(action.icon)

        Image(

            painter = painter,

            colorFilter = if (action.attribution != null) ColorFilter.tint(outlineColor) else null,

            contentDescription = action.label,

            modifier = Modifier.size(24.dp).clip(CircleShape),

        )

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/NavBarPill.kt

+0 −7
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.alpha

import androidx.compose.ui.draw.clip

import androidx.compose.ui.graphics.ColorFilter

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.layout.onGloballyPositioned

import androidx.compose.ui.platform.LocalDensity
@@ -143,12 +142,6 @@ fun NavBarPill( 
                    ) {

                        Image(

                            painter = rememberDrawablePainter(action.icon),

                            colorFilter =

                                if (hasAttribution) {

                                    ColorFilter.tint(outlineColor)

                                } else {

                                    null

                                },

                            contentDescription = action.label,

                            modifier = Modifier.size(16.dp).clip(CircleShape),

                        )

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ShortPill.kt

+3 −18
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.clip

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.ColorFilter

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.text.style.TextOverflow
@@ -119,7 +118,7 @@ fun ShortPill( 
                    modifier = pillModifier.defaultMinSize(minWidth = minSize),

                ) {

                    actions.take(3).fastForEach { action ->

                        Icon(action, backgroundColor, outlineColor)

                        Icon(action, backgroundColor)

                        if (actions.size == 1) {

                            Text(

                                text = action.label,
@@ -151,9 +150,7 @@ fun ShortPill( 
                    verticalArrangement = Arrangement.spacedBy(-4.dp, Alignment.CenterVertically),

                    modifier = pillModifier.defaultMinSize(minHeight = minSize),

                ) {

                    actions.take(3).fastForEach { action ->

                        Icon(action, backgroundColor, outlineColor)

                    }

                    actions.take(3).fastForEach { action -> Icon(action, backgroundColor) }

                }



                CloseButton(
@@ -191,21 +188,9 @@ private fun CloseButton( 
}



@Composable

private fun Icon(

    action: ActionViewModel,

    backgroundColor: Color,

    outlineColor: Color,

    modifier: Modifier = Modifier,

) {

    val hasAttribution = action.attribution != null

private fun Icon(action: ActionViewModel, backgroundColor: Color, modifier: Modifier = Modifier) {

    Image(

        painter = rememberDrawablePainter(action.icon),

        colorFilter =

            if (hasAttribution) {

                ColorFilter.tint(outlineColor)

            } else {

                null

            },

        contentDescription = action.label,

        modifier =

            modifier