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

Commit dc09df61 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Chips] Add SysUI resource tag to Compose chips. 

This lets our PlatformScenarioTests find the Compose views to assert
they're visible and/or assert certain facts about them.

Bug: 399756111
Flag: com.android.systemui.status_bar_chips_modernization
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.statusbar.ScreenRecordingIcon#screenRecordingIcon_showOnStatusBar
Change-Id: I4f697b3a894fc4d8b7a4a09b90b33d63c41c84bd
parent f127a153

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChip.kt

+6 −1
Original line number Diff line number Diff line
@@ -75,7 +75,12 @@ fun OngoingActivityChip( 
            }

        }

        is OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification -> {

            ChipBody(model, iconViewStore, onClick = { clickBehavior.onClick() })

            ChipBody(

                model,

                iconViewStore,

                onClick = { clickBehavior.onClick() },

                modifier = modifier,

            )

        }



        is OngoingActivityChipModel.ClickBehavior.None -> {

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt

+8 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.compose.runtime.key 
import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.dimensionResource

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.res.R

import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChipsModel

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder
@@ -47,7 +48,13 @@ fun OngoingActivityChips( 
        chips.active

            .filter { !it.isHidden }

            .forEach {

                key(it.key) { OngoingActivityChip(model = it, iconViewStore = iconViewStore) }

                key(it.key) {

                    OngoingActivityChip(

                        model = it,

                        iconViewStore = iconViewStore,

                        modifier = Modifier.sysuiResTag(it.key),

                    )

                }

            }

    }

}