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

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

Merge "Fix context and resources used by some Shade window classes" into main

parents 77800551 153bbea9

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

+2 −1
Original line number Diff line number Diff line
@@ -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,

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

+2 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/MediaInRowInLandscapeViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/BaseAutoAddableModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -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(