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

Commit 8756bcb6 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Ensure QS classes use display-aware context 

This commit updates all classes in com.android.systemui.qs to utilize a @ShadeDisplayAware annotated context. This change prepares for the potential movement of the shade window to a different display, ensuring correct inflation and rendering of keyguard elements.

A linter will be implemented shortly to enforce the use of this annotated context and prevent issues with non-annotated contexts/resources.

Currently, this change has no functional impact as the feature flag is disabled. The @ShadeDisplayAware context remains equivalent to the @Application context.

Bug: 362719719
Bug: 374267505
Test: SystemUI presubmit tests for all changed classes
Flag: com.android.systemui.shade_window_goes_around
Change-Id: If69405be44c14387e8e404b0c56a64e9c6c27ff8
parent 6c74a6cc

packages/SystemUI/src/com/android/systemui/qs/QSHostAdapter.kt

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.qs.pipeline.data.repository.TileSpecRepository.Compa 
import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor

import com.android.systemui.qs.pipeline.shared.QSPipelineFlagsRepository

import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.shade.ShadeDisplayAware

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Job
@@ -48,7 +49,7 @@ class QSHostAdapter 
@Inject

constructor(

    private val interactor: CurrentTilesInteractor,

    private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val tileServiceRequestControllerBuilder: TileServiceRequestController.Builder,

    @Application private val scope: CoroutineScope,

    dumpManager: DumpManager,

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig; 
import com.android.systemui.res.R;

import com.android.systemui.security.data.model.SecurityModel;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.policy.SecurityController;
@@ -177,7 +178,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { 


    @Inject

    QSSecurityFooterUtils(

            @Application Context context, DevicePolicyManager devicePolicyManager,

            @ShadeDisplayAware Context context, DevicePolicyManager devicePolicyManager,

            UserTracker userTracker, @Main Handler mainHandler, ActivityStarter activityStarter,

            SecurityController securityController, @Background Looper bgLooper,

            DialogTransitionAnimator dialogTransitionAnimator) {

packages/SystemUI/src/com/android/systemui/qs/composefragment/dagger/QSFragmentComposeModule.kt

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.util.Utils

import dagger.Module

import dagger.Provides
@@ -34,7 +35,7 @@ interface QSFragmentComposeModule { 
        @Provides

        @SysUISingleton

        @Named(QS_USING_MEDIA_PLAYER)

        fun providesUsingMedia(@Application context: Context): Boolean {

        fun providesUsingMedia(@ShadeDisplayAware context: Context): Boolean {

            return QSComposeFragment.isEnabled && Utils.useQsMediaPlayer(context)

        }

    }

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.systemui.qs.external.CustomTile; 
import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon;

import com.android.systemui.res.R;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeDisplayAware;



import java.util.ArrayList;

import java.util.Arrays;
@@ -69,7 +70,7 @@ public class TileQueryHelper { 


    @Inject

    public TileQueryHelper(

            Context context,

            @ShadeDisplayAware Context context,

            UserTracker userTracker,

            @Main Executor mainExecutor,

            @Background Executor bgExecutor

packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.systemui.qs.footer.data.model.UserSwitcherStatusModel 
import com.android.systemui.qs.footer.domain.interactor.FooterActionsInteractor

import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig

import com.android.systemui.res.R

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.util.icuMessageFormat

import javax.inject.Inject

import javax.inject.Named
@@ -112,7 +113,7 @@ class FooterActionsViewModel( 
    class Factory

    @Inject

    constructor(

        @Application private val context: Context,

        @ShadeDisplayAware  private val context: Context,

        private val falsingManager: FalsingManager,

        private val footerActionsInteractor: FooterActionsInteractor,

        private val globalActionsDialogLiteProvider: Provider<GlobalActionsDialogLite>,
@@ -175,7 +176,7 @@ class FooterActionsViewModel( 
}



fun FooterActionsViewModel(

    @Application appContext: Context,

    @ShadeDisplayAware appContext: Context,

    footerActionsInteractor: FooterActionsInteractor,

    falsingManager: FalsingManager,

    globalActionsDialogLite: GlobalActionsDialogLite,