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

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

Still show "+N" text after clicking the navbar pill. 

Bug: 444579759
Test: Manual
Flag: EXEMPT BUGFIX
Change-Id: I9fe8ba9b230cfe973cbe8b5c05e9734e840e5ef4
parent d616a256

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

+6 −6
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ fun NavBarPill( 
    val hideAnimationInProgress = remember { mutableStateOf(false) }

    val expandAnimationInProgress = remember { mutableStateOf(false) }

    val collapseAnimationInProgress = remember { mutableStateOf(false) }

    LaunchedEffect(expanded) {

        if (expanded) {

            wasEverCollapsed = true

        }

    }



    var expandedSize by remember { mutableStateOf(IntSize.Zero) }

    val visibleState = remember { MutableTransitionState(false) }
@@ -184,6 +179,11 @@ fun NavBarPill( 
            animationSpec = tween(durationMillis = BLUR_FADE_DURATION_MILLIS),

        )

    }

    LaunchedEffect(expanded, expansionAlpha) {

        if (expanded && expansionAlpha == 0f) {

            wasEverCollapsed = true

        }

    }



    val config = LocalConfiguration.current

    val isBoldTextEnabled = config.fontWeightAdjustment > 0
@@ -308,7 +308,7 @@ fun NavBarPill( 
                                }

                            if ((filteredActions.size == 1 || isMrAction) && !expandedChip) {

                                expandedChip = true

                                val hasBackground = filteredActions.size > 1

                                val hasBackground = (!wasEverCollapsed && filteredActions.size > 1)

                                // Expanded chip for single action or MR

                                Row(

                                    horizontalArrangement = Arrangement.spacedBy(6.dp),