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

Commit 086fefe5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] add QS host for media in split shade" into main

parents 324dce3d 5ac1c972

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+16 −8
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import com.android.systemui.media.controls.ui.controller.MediaCarouselController 
import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager

import com.android.systemui.media.controls.ui.view.MediaHost

import com.android.systemui.media.controls.ui.view.MediaHostState

import com.android.systemui.media.dagger.MediaModule.QS_PANEL

import com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL

import com.android.systemui.notifications.ui.composable.NotificationScrollingStack

import com.android.systemui.notifications.ui.composable.NotificationStackCutoffGuideline
@@ -150,7 +151,8 @@ constructor( 
    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,

    private val statusBarIconController: StatusBarIconController,

    private val mediaCarouselController: MediaCarouselController,

    @Named(QUICK_QS_PANEL) private val mediaHost: MediaHost,

    @Named(QUICK_QS_PANEL) private val qqsMediaHost: MediaHost,

    @Named(QS_PANEL) private val qsMediaHost: MediaHost,

) : ComposableScene {



    override val key = Scenes.Shade
@@ -174,15 +176,20 @@ constructor( 
            createBatteryMeterViewController = batteryMeterViewControllerFactory::create,

            statusBarIconController = statusBarIconController,

            mediaCarouselController = mediaCarouselController,

            mediaHost = mediaHost,

            qqsMediaHost = qqsMediaHost,

            qsMediaHost = qsMediaHost,

            modifier = modifier,

            shadeSession = shadeSession,

        )



    init {

        mediaHost.expansion = MediaHostState.EXPANDED

        mediaHost.showsOnlyActiveMedia = true

        mediaHost.init(MediaHierarchyManager.LOCATION_QQS)

        qqsMediaHost.expansion = MediaHostState.EXPANDED

        qqsMediaHost.showsOnlyActiveMedia = true

        qqsMediaHost.init(MediaHierarchyManager.LOCATION_QQS)



        qsMediaHost.expansion = MediaHostState.EXPANDED

        qsMediaHost.showsOnlyActiveMedia = false

        qsMediaHost.init(MediaHierarchyManager.LOCATION_QS)

    }

}
@@ -195,7 +202,8 @@ private fun SceneScope.ShadeScene( 
    createBatteryMeterViewController: (ViewGroup, StatusBarLocation) -> BatteryMeterViewController,

    statusBarIconController: StatusBarIconController,

    mediaCarouselController: MediaCarouselController,

    mediaHost: MediaHost,

    qqsMediaHost: MediaHost,

    qsMediaHost: MediaHost,

    modifier: Modifier = Modifier,

    shadeSession: SaveableSession,

) {
@@ -210,7 +218,7 @@ private fun SceneScope.ShadeScene( 
                createBatteryMeterViewController = createBatteryMeterViewController,

                statusBarIconController = statusBarIconController,

                mediaCarouselController = mediaCarouselController,

                mediaHost = mediaHost,

                mediaHost = qqsMediaHost,

                modifier = modifier,

                shadeSession = shadeSession,

            )
@@ -223,7 +231,7 @@ private fun SceneScope.ShadeScene( 
                createBatteryMeterViewController = createBatteryMeterViewController,

                statusBarIconController = statusBarIconController,

                mediaCarouselController = mediaCarouselController,

                mediaHost = mediaHost,

                mediaHost = qsMediaHost,

                modifier = modifier,

                shadeSession = shadeSession,

            )