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

Commit e202bf4c authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Use correct context and configuration to instantiate media carousel 

This is needed as the shade can move display, so using the context or configuration related to the default display is wrong.

This was causing media to have an incredibly big size on external displays.

Bug: 362719719
Bug: 407146677
Test: MediaCarouselControllerTest
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I1962375a193fb5a75ddf4b2cb3985962974ed994
parent 5d640a15

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+3 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.systemui.qs.PageIndicator 
import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.featurepods.media.domain.interactor.MediaControlChipInteractor

import com.android.systemui.statusbar.notification.collection.provider.OnReorderingAllowedListener

import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider
@@ -121,7 +122,7 @@ class MediaCarouselController 
@Inject

constructor(

    @Application applicationScope: CoroutineScope,

    @Main private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val mediaControlPanelFactory: Provider<MediaControlPanel>,

    private val visualStabilityProvider: VisualStabilityProvider,

    private val mediaHostStatesManager: MediaHostStatesManager,
@@ -132,7 +133,7 @@ constructor( 
    @Background private val bgExecutor: Executor,

    @Background private val backgroundDispatcher: CoroutineDispatcher,

    private val mediaManager: MediaDataManager,

    @Main configurationController: ConfigurationController,

    @ShadeDisplayAware configurationController: ConfigurationController,

    private val falsingManager: FalsingManager,

    dumpManager: DumpManager,

    private val logger: MediaUiEventLogger,

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+2 −1
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.surfaceeffects.PaintDrawCallback;
@@ -272,7 +273,7 @@ public class MediaControlPanel { 
     */

    @Inject

    public MediaControlPanel(

            @Main Context context,

            @ShadeDisplayAware Context context,

            @Background Executor backgroundExecutor,

            @Main DelayableExecutor mainExecutor,

            ActivityStarter activityStarter,

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt

+3 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel 
import com.android.systemui.media.controls.ui.viewmodel.SeekBarViewModel

import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.surfaceeffects.PaintDrawCallback

import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect
@@ -79,8 +80,8 @@ import javax.inject.Inject 
open class MediaViewController

@Inject

constructor(

    @Main private val context: Context,

    @Main private val configurationController: ConfigurationController,

    @ShadeDisplayAware private val context: Context,

    @ShadeDisplayAware private val configurationController: ConfigurationController,

    private val mediaHostStatesManager: MediaHostStatesManager,

    private val logger: MediaViewLogger,

    private val seekBarViewModel: SeekBarViewModel,