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

Commit 711005ea authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Adds coroutine tracing to activatables and sysUiViewModels 

Bug: 354269846
Test: smoke test with flexiglass - visited every scene before/after
unlock and after relock
Flag: com.android.systemui.scene_container

Change-Id: Ib32537337b897c38023e1952f6a539a933b4423a
parent 1f4bce7d

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ constructor( 
        modifier: Modifier,

    ) =

        BouncerScene(

            viewModel = rememberViewModel { contentViewModelFactory.create() },

            viewModel = rememberViewModel("BouncerScene") { contentViewModelFactory.create() },

            dialogFactory = dialogFactory,

            modifier = modifier,

        )

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenContent.kt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class LockscreenContent( 
    fun SceneScope.Content(

        modifier: Modifier = Modifier,

    ) {

        val viewModel = rememberViewModel { viewModelFactory.create() }

        val viewModel = rememberViewModel("LockscreenContent") { viewModelFactory.create() }

        val isContentVisible: Boolean by viewModel.isContentVisible.collectAsStateWithLifecycle()

        if (!isContentVisible) {

            // If the content isn't supposed to be visible, show a large empty box as it's needed

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ constructor( 
    fun SceneScope.HeadsUpNotifications() {

        SnoozeableHeadsUpNotificationSpace(

            stackScrollView = stackScrollView.get(),

            viewModel = rememberViewModel { viewModelFactory.create() },

            viewModel = rememberViewModel("HeadsUpNotifications") { viewModelFactory.create() },

        )

    }
@@ -107,7 +107,7 @@ constructor( 


        ConstrainedNotificationStack(

            stackScrollView = stackScrollView.get(),

            viewModel = rememberViewModel { viewModelFactory.create() },

            viewModel = rememberViewModel("Notifications") { viewModelFactory.create() },

            modifier =

                modifier

                    .fillMaxWidth()

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeScene.kt

+4 −3
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ constructor( 
    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        val notificationsPlaceholderViewModel = rememberViewModel {

        val notificationsPlaceholderViewModel =

            rememberViewModel("NotificationsShadeScene") {

                notificationsPlaceholderViewModelFactory.create()

            }

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+8 −5
Original line number Diff line number Diff line
@@ -152,7 +152,9 @@ constructor( 
            notificationStackScrollView = notificationStackScrollView.get(),

            viewModelFactory = contentViewModelFactory,

            notificationsPlaceholderViewModel =

                rememberViewModel { notificationsPlaceholderViewModelFactory.create() },

                rememberViewModel("QuickSettingsScene-notifPlaceholderViewModel") {

                    notificationsPlaceholderViewModelFactory.create()

                },

            createTintedIconManager = tintedIconManagerFactory::create,

            createBatteryMeterViewController = batteryMeterViewControllerFactory::create,

            statusBarIconController = statusBarIconController,
@@ -179,8 +181,9 @@ private fun SceneScope.QuickSettingsScene( 
) {

    val cutoutLocation = LocalDisplayCutout.current.location



    val viewModel = rememberViewModel { viewModelFactory.create() }

    val brightnessMirrorViewModel = rememberViewModel {

    val viewModel = rememberViewModel("QuickSettingsScene-viewModel") { viewModelFactory.create() }

    val brightnessMirrorViewModel =

        rememberViewModel("QuickSettingsScene-brightnessMirrorViewModel") {

            viewModel.brightnessMirrorViewModelFactory.create()

        }

    val brightnessMirrorShowing by brightnessMirrorViewModel.isShowing.collectAsStateWithLifecycle()