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

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

[SB][Chips] Use atoms instead of UiEvents for chip event logging. 

The UI events don't have enough granularity to capture all the details
we want about chips, so this CL instead uses a custom logging atom. See
I8aed5b2517221923a14ae9284baa1f3a3e1ad477 for the atom definition.

Bug: 386821418
Bug: 364653005
Flag: android.app.ui_rich_ongoing
Test: manual: verified logged atoms via atom tester

Change-Id: Ie90953a6912eb363331a4924d47db1a98c11f1b6
parent 45e280df

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() { 
                dialogDelegate,

                dialogTransitionAnimator,

                cuj,

                key = "key",

                instanceId = InstanceId.fakeInstanceId(0),

                uiEventLogger = kosmos.statusBarChipsUiEventLogger,

                logger = logcatLogBuffer("OngoingActivityChipViewModelTest"),
@@ -94,6 +95,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() { 
                dialogDelegate,

                dialogTransitionAnimator,

                cuj,

                key = "key",

                instanceId = InstanceId.fakeInstanceId(0),

                uiEventLogger = kosmos.statusBarChipsUiEventLogger,

                logger = logcatLogBuffer("OngoingActivityChipViewModelTest"),

packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ constructor( 
        return View.OnClickListener { view ->

            StatusBarChipsModernization.assertInLegacyMode()



            logChipTapped(instanceId)

            logChipTapped(key = notificationKey, instanceId = instanceId)



            val backgroundView =

                view.requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)
@@ -328,7 +328,7 @@ constructor( 
            onClick = { expandable ->

                StatusBarChipsModernization.unsafeAssertInNewMode()



                logChipTapped(instanceId)

                logChipTapped(key = notificationKey, instanceId = instanceId)



                val animationController =

                    if (
@@ -352,9 +352,9 @@ constructor( 
        )

    }



    private fun logChipTapped(instanceId: InstanceId?) {

    private fun logChipTapped(key: String, instanceId: InstanceId?) {

        logger.i({ "Chip clicked" }) {}

        uiEventLogger.logChipTapToShow(instanceId)

        uiEventLogger.logChipTapToShow(key = key, instanceId = instanceId)

    }



    private fun getContentDescription(appName: String): ContentDescription {

packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ constructor( 
                    createCastScreenToOtherDeviceDialogDelegate(state),

                    dialogTransitionAnimator,

                    DIALOG_CUJ,

                    key = KEY,

                    instanceId = instanceId,

                    uiEventLogger = uiEventLogger,

                    logger = logger,
@@ -232,6 +233,7 @@ constructor( 
                            createCastScreenToOtherDeviceDialogDelegate(state),

                            dialogTransitionAnimator,

                            DIALOG_CUJ,

                            key = KEY,

                            instanceId = instanceId,

                            uiEventLogger = uiEventLogger,

                            logger = logger,
@@ -261,6 +263,7 @@ constructor( 
                    createGenericCastToOtherDeviceDialogDelegate(deviceName),

                    dialogTransitionAnimator,

                    DIALOG_CUJ_AUDIO_ONLY,

                    key = KEY,

                    instanceId = instanceId,

                    uiEventLogger = uiEventLogger,

                    logger = logger,
@@ -272,6 +275,7 @@ constructor( 
                        createGenericCastToOtherDeviceDialogDelegate(deviceName),

                        dialogTransitionAnimator,

                        DIALOG_CUJ_AUDIO_ONLY,

                        key = KEY,

                        instanceId = instanceId,

                        uiEventLogger = uiEventLogger,

                        logger = logger,

packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ constructor( 
                                    createDelegate(state.recordedTask),

                                    dialogTransitionAnimator,

                                    DIALOG_CUJ,

                                    key = KEY,

                                    instanceId = instanceId,

                                    uiEventLogger = uiEventLogger,

                                    logger = logger,
@@ -126,6 +127,7 @@ constructor( 
                                        dialogDelegate = createDelegate(state.recordedTask),

                                        dialogTransitionAnimator = dialogTransitionAnimator,

                                        DIALOG_CUJ,

                                        key = KEY,

                                        instanceId = instanceId,

                                        uiEventLogger = uiEventLogger,

                                        logger = logger,

packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ constructor( 
                    createShareScreenToAppDialogDelegate(state),

                    dialogTransitionAnimator,

                    DIALOG_CUJ,

                    key = KEY,

                    instanceId = instanceId,

                    uiEventLogger = uiEventLogger,

                    logger = logger,
@@ -256,6 +257,7 @@ constructor( 
                            createShareScreenToAppDialogDelegate(state),

                            dialogTransitionAnimator,

                            DIALOG_CUJ,

                            key = KEY,

                            instanceId = instanceId,

                            uiEventLogger = uiEventLogger,

                            logger = logger,
@@ -287,6 +289,7 @@ constructor( 
                    createGenericShareToAppDialogDelegate(),

                    dialogTransitionAnimator,

                    DIALOG_CUJ_AUDIO_ONLY,

                    key = KEY,

                    instanceId = instanceId,

                    uiEventLogger = uiEventLogger,

                    logger = logger,
@@ -298,6 +301,7 @@ constructor( 
                        createGenericShareToAppDialogDelegate(),

                        dialogTransitionAnimator,

                        DIALOG_CUJ_AUDIO_ONLY,

                        key = KEY,

                        instanceId = instanceId,

                        uiEventLogger = uiEventLogger,

                        logger = logger,