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

Commit 37420c9f authored by Michael Mikhail's avatar Michael Mikhail
Browse files

[Flexiglass] use media composable in communal hub 

Flag: com.android.systemui.scene_container
Flag: com.android.systemui.media_controls_in_compose
Bug: 397989775
Test: Build.
Change-Id: Id893c17d04efdf13890c2d909c8e6591b2815f35
parent e1b8376c

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+1 −9
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ import com.android.systemui.communal.util.WindowSizeUtils 
import com.android.systemui.communal.widgets.SmartspaceAppWidgetHostView

import com.android.systemui.communal.widgets.WidgetConfigurator

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.media.controls.ui.composable.MediaCarousel

import com.android.systemui.media.remedia.ui.compose.Media

import com.android.systemui.media.remedia.ui.compose.MediaPresentationStyle

import com.android.systemui.res.R
@@ -1840,14 +1839,7 @@ private fun Umo( 
                }

            }

    ) {

        if (SceneContainerFlag.isEnabled && contentScope != null) {

            contentScope.MediaCarousel(

                modifier = modifier.fillMaxSize(),

                isVisible = true,

                mediaHost = viewModel.mediaHost,

                carouselController = viewModel.mediaCarouselController,

            )

        } else if (Flags.mediaControlsInCompose()) {

        if (SceneContainerFlag.isEnabled || Flags.mediaControlsInCompose()) {

            Media(

                viewModelFactory = viewModel.mediaViewModelFactory,

                presentationStyle = MediaPresentationStyle.Large,