diff options
19 files changed, 36 insertions, 21 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt index 520cc2365088..606f71a162d8 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt @@ -29,6 +29,7 @@ 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.KEYGUARD import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.notification.stack.MediaContainerView @@ -53,7 +54,7 @@ constructor( @param:Named(KEYGUARD) private val mediaHost: MediaHost, private val bypassController: KeyguardBypassController, private val statusBarStateController: SysuiStatusBarStateController, - private val context: Context, + @ShadeDisplayAware private val context: Context, configurationController: ConfigurationController, private val splitShadeStateController: SplitShadeStateController, private val logger: KeyguardMediaControllerLogger, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt index 1f70ac946da0..20593942148b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt @@ -53,6 +53,7 @@ import com.android.systemui.media.dream.MediaDreamComplication import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.CrossFadeHelper import com.android.systemui.statusbar.StatusBarState @@ -102,7 +103,7 @@ val View.isShownNotFaded: Boolean class MediaHierarchyManager @Inject constructor( - private val context: Context, + @ShadeDisplayAware private val context: Context, private val statusBarStateController: SysuiStatusBarStateController, private val keyguardStateController: KeyguardStateController, private val bypassController: KeyguardBypassController, diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt index 0dade7438720..c09d319f82f5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt @@ -95,8 +95,8 @@ class QSFragmentComposeViewModel @AssistedInject constructor( containerViewModelFactory: QuickSettingsContainerViewModel.Factory, + @ShadeDisplayAware private val resources: Resources, quickQuickSettingsViewModelFactory: QuickQuickSettingsViewModel.Factory, - @Main private val resources: Resources, footerActionsViewModelFactory: FooterActionsViewModel.Factory, private val footerActionsController: FooterActionsController, private val sysuiStatusBarStateController: SysuiStatusBarStateController, diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt index 2ed8fd20df8f..706d5a065234 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt @@ -20,13 +20,13 @@ import android.content.res.Configuration import android.content.res.Resources import androidx.compose.runtime.getValue import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.lifecycle.ExclusiveActivatable import com.android.systemui.lifecycle.Hydrator import com.android.systemui.media.controls.ui.controller.MediaHostStatesManager import com.android.systemui.media.controls.ui.controller.MediaLocation import com.android.systemui.media.controls.ui.view.MediaHostState import com.android.systemui.qs.composefragment.dagger.QSFragmentComposeModule +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeModeInteractor import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow @@ -46,7 +46,7 @@ import kotlinx.coroutines.flow.onStart class MediaInRowInLandscapeViewModel @AssistedInject constructor( - @Main resources: Resources, + @ShadeDisplayAware resources: Resources, configurationInteractor: ConfigurationInteractor, shadeModeInteractor: ShadeModeInteractor, private val mediaHostStatesManager: MediaHostStatesManager, diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/BaseAutoAddableModule.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/BaseAutoAddableModule.kt index a6edb586776b..c9f6dcfe4293 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/BaseAutoAddableModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/BaseAutoAddableModule.kt @@ -17,7 +17,6 @@ package com.android.systemui.qs.pipeline.dagger import android.content.res.Resources -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.pipeline.domain.autoaddable.A11yShortcutAutoAddable import com.android.systemui.qs.pipeline.domain.autoaddable.A11yShortcutAutoAddableList import com.android.systemui.qs.pipeline.domain.autoaddable.AutoAddableSetting @@ -30,6 +29,7 @@ import com.android.systemui.qs.pipeline.domain.autoaddable.NightDisplayAutoAddab import com.android.systemui.qs.pipeline.domain.autoaddable.WalletAutoAddable import com.android.systemui.qs.pipeline.domain.autoaddable.WorkTileAutoAddable import com.android.systemui.qs.pipeline.domain.model.AutoAddable +import com.android.systemui.shade.ShadeDisplayAware import dagger.Binds import dagger.Module import dagger.Provides @@ -43,7 +43,7 @@ interface BaseAutoAddableModule { @Provides @ElementsIntoSet fun providesAutoAddableSetting( - @Main resources: Resources, + @ShadeDisplayAware resources: Resources, autoAddableSettingFactory: AutoAddableSetting.Factory, ): Set<AutoAddable> { return AutoAddableSettingList.parseSettingsResource( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeKeyguardTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeKeyguardTransitionController.kt index 31e5df9e668a..891902edfa1c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeKeyguardTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeKeyguardTransitionController.kt @@ -6,6 +6,7 @@ import android.util.MathUtils import com.android.systemui.dump.DumpManager import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.SplitShadeStateController @@ -19,7 +20,7 @@ class LockscreenShadeKeyguardTransitionController constructor( private val mediaHierarchyManager: MediaHierarchyManager, @Assisted private val shadeLockscreenInteractor: ShadeLockscreenInteractor, - context: Context, + @ShadeDisplayAware context: Context, configurationController: ConfigurationController, dumpManager: DumpManager, splitShadeStateController: SplitShadeStateController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeQsTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeQsTransitionController.kt index adca3f2d25d6..233d8180d588 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeQsTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeQsTransitionController.kt @@ -24,6 +24,7 @@ import androidx.annotation.Px import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.qs.QS import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.SplitShadeStateController import dagger.assisted.Assisted @@ -35,7 +36,7 @@ import kotlin.math.max class LockscreenShadeQsTransitionController @AssistedInject constructor( - context: Context, + @ShadeDisplayAware context: Context, configurationController: ConfigurationController, dumpManager: DumpManager, @Assisted private val qsProvider: () -> QS?, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeScrimTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeScrimTransitionController.kt index 77a09608dbd3..058ccbad37dc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeScrimTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeScrimTransitionController.kt @@ -5,6 +5,7 @@ import android.util.IndentingPrintWriter import android.util.MathUtils import com.android.systemui.res.R import com.android.systemui.dump.DumpManager +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.phone.ScrimController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.SplitShadeStateController @@ -15,7 +16,7 @@ class LockscreenShadeScrimTransitionController @Inject constructor( private val scrimController: ScrimController, - context: Context, + @ShadeDisplayAware context: Context, configurationController: ConfigurationController, dumpManager: DumpManager, splitShadeStateController: SplitShadeStateController diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index ba41a631a2c6..10f61c66c838 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -29,6 +29,7 @@ import com.android.systemui.plugins.qs.QS import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.data.repository.ShadeRepository import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor @@ -67,7 +68,7 @@ constructor( private val keyguardTransitionControllerFactory: LockscreenShadeKeyguardTransitionController.Factory, private val depthController: NotificationShadeDepthController, - private val context: Context, + @ShadeDisplayAware private val context: Context, private val splitShadeOverScrollerFactory: SplitShadeLockScreenOverScroller.Factory, private val singleShadeOverScrollerFactory: SingleShadeLockScreenOverScroller.Factory, private val activityStarter: ActivityStarter, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java index fdc1c0e4dd22..c0ee56bbf149 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java @@ -54,6 +54,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.power.domain.interactor.PowerInteractor; import com.android.systemui.res.R; import com.android.systemui.scene.shared.flag.SceneContainerFlag; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.shade.domain.interactor.ShadeInteractor; import com.android.systemui.statusbar.dagger.CentralSurfacesDependenciesModule; import com.android.systemui.statusbar.notification.NotifPipelineFlags; @@ -260,7 +261,7 @@ public class NotificationRemoteInputManager implements CoreStartable { */ @Inject public NotificationRemoteInputManager( - Context context, + @ShadeDisplayAware Context context, NotifPipelineFlags notifPipelineFlags, NotificationLockscreenUserManager lockscreenUserManager, SmartReplyController smartReplyController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt index e3b36df9aed7..3e761079bc49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -42,6 +42,7 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.shade.ShadeExpansionListener import com.android.systemui.shared.Flags.ambientAod @@ -80,7 +81,7 @@ constructor( private val wallpaperController: WallpaperController, private val notificationShadeWindowController: NotificationShadeWindowController, private val dozeParameters: DozeParameters, - private val context: Context, + @ShadeDisplayAware private val context: Context, private val splitShadeStateController: SplitShadeStateController, private val windowRootViewBlurInteractor: WindowRootViewBlurInteractor, @Application private val applicationScope: CoroutineScope, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java index 321b6084831e..df8b514d6dbc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java @@ -29,6 +29,7 @@ import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import java.util.ArrayList; @@ -47,7 +48,7 @@ public class RemoteInputNotificationRebuilder { private final Context mContext; @Inject - RemoteInputNotificationRebuilder(Context context) { + RemoteInputNotificationRebuilder(@ShadeDisplayAware Context context) { mContext = context; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScroller.kt b/packages/SystemUI/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScroller.kt index 612a365dbe8b..ef69399917f9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScroller.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScroller.kt @@ -11,6 +11,7 @@ import com.android.systemui.res.R import com.android.app.animation.Interpolators import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.qs.QS +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController import com.android.systemui.statusbar.phone.ScrimController import com.android.systemui.statusbar.policy.ConfigurationController @@ -24,7 +25,7 @@ class SplitShadeLockScreenOverScroller constructor( configurationController: ConfigurationController, dumpManager: DumpManager, - private val context: Context, + @ShadeDisplayAware private val context: Context, private val scrimController: ScrimController, private val statusBarStateController: SysuiStatusBarStateController, @Assisted private val qSProvider: () -> QS?, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java index d327fc23fd06..434eb7d3d410 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -38,6 +38,7 @@ import com.android.systemui.power.domain.interactor.PowerInteractor; import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shade.NotificationPanelViewController; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.shade.ShadeSurface; import com.android.systemui.shade.ShadeSurfaceImpl; import com.android.systemui.shade.carrier.ShadeCarrierGroupController; @@ -92,7 +93,7 @@ public interface CentralSurfacesDependenciesModule { @SysUISingleton @Provides static NotificationMediaManager provideNotificationMediaManager( - Context context, + @ShadeDisplayAware Context context, NotificationVisibilityProvider visibilityProvider, NotifPipeline notifPipeline, NotifCollection notifCollection, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 85cd50565f88..7b5f5f6d8060 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt @@ -61,6 +61,7 @@ import com.android.systemui.plugins.clocks.WeatherData import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.res.R import com.android.systemui.settings.UserTracker +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.regionsampling.RegionSampler import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DATE_SMARTSPACE_DATA_PLUGIN import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.WEATHER_SMARTSPACE_DATA_PLUGIN @@ -88,7 +89,7 @@ import javax.inject.Named class LockscreenSmartspaceController @Inject constructor( - private val context: Context, + @ShadeDisplayAware private val context: Context, private val featureFlags: FeatureFlags, private val activityStarter: ActivityStarter, private val falsingManager: FalsingManager, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java index 91653d314681..e10825bc52fe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java @@ -32,6 +32,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.res.R; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.notification.NotificationActivityStarter; import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider; @@ -168,7 +169,7 @@ public interface NotificationsModule { @SysUISingleton @Provides static NotificationsController provideNotificationsController( - Context context, + @ShadeDisplayAware Context context, Provider<NotificationsControllerImpl> realController, Provider<NotificationsControllerStub> stubController) { if (context.getResources().getBoolean(R.bool.config_renderNotifications)) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/ui/viewmodel/EmptyShadeViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/ui/viewmodel/EmptyShadeViewModel.kt index fa0cea15c43f..7e6c6050d0b4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/ui/viewmodel/EmptyShadeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/ui/viewmodel/EmptyShadeViewModel.kt @@ -23,6 +23,7 @@ import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dump.DumpManager import com.android.systemui.modes.shared.ModesUi import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.notifications.domain.interactor.NotificationSettingsInteractor import com.android.systemui.statusbar.notification.NotificationActivityStarter.SettingsIntent import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor @@ -50,7 +51,7 @@ import kotlinx.coroutines.flow.onStart class EmptyShadeViewModel @AssistedInject constructor( - private val context: Context, + @ShadeDisplayAware private val context: Context, zenModeInteractor: ZenModeInteractor, seenNotificationsInteractor: SeenNotificationsInteractor, notificationSettingsInteractor: NotificationSettingsInteractor, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.kt index 67a8e3d0e345..ef09907609df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.kt @@ -19,6 +19,7 @@ import android.app.StatusBarManager import android.content.Context import android.content.res.Configuration import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.CommandQueue import javax.inject.Inject @@ -29,7 +30,7 @@ import javax.inject.Inject */ @SysUISingleton class RemoteInputQuickSettingsDisabler @Inject constructor( - private val context: Context, + @ShadeDisplayAware private val context: Context, private val commandQueue: CommandQueue, private val splitShadeStateController: SplitShadeStateController, configController: ConfigurationController diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt index 583a9def8094..18c4a4df7c7a 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelKosmos.kt @@ -49,8 +49,8 @@ val Kosmos.qsFragmentComposeViewModelFactory by ): QSFragmentComposeViewModel { return QSFragmentComposeViewModel( quickSettingsContainerViewModelFactory, - quickQuickSettingsViewModelFactory, mainResources, + quickQuickSettingsViewModelFactory, footerActionsViewModelFactory, footerActionsController, sysuiStatusBarStateController, |