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

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

Merge "Make HomeStatusBarInteractor a @PerDisplaySingleton" into main

parents c61d96f7 4e6f3dd8

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarPerDisplayModule.kt

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.statusbar.data.repository.StatusBarConfigurationCont 
import com.android.systemui.statusbar.data.repository.StatusBarConfigurationControllerStore

import com.android.systemui.statusbar.domain.interactor.StatusBarIconRefreshInteractor

import com.android.systemui.statusbar.domain.interactor.StatusBarIconRefreshInteractorImpl

import com.android.systemui.statusbar.pipeline.shared.domain.interactor.HomeStatusBarInteractor

import com.android.systemui.statusbar.ui.SystemBarUtilsState

import com.android.systemui.statusbar.window.StatusBarWindowStateController

import dagger.Binds
@@ -59,6 +60,10 @@ interface StatusBarPerDisplayModule { 
        impl: OngoingActivityChipsViewModel

    ): OngoingActivityChipsViewModel



    @Binds

    @DisplayAware

    fun homeStatusBarInteractor(interactor: HomeStatusBarInteractor): HomeStatusBarInteractor



    companion object {

        /**

         * Ideally StatusBarConfigurationControllerStore should be moved to [PerDisplaySingleton] in

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarInteractor.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar.pipeline.shared.domain.interactor



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDisplaySingleton

import com.android.systemui.statusbar.disableflags.domain.interactor.DisableFlagsInteractor

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.CarrierConfigInteractor
@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.map 
 * Interactor for the home screen status bar (aka

 * [com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment]).

 */

@SysUISingleton

@PerDisplaySingleton

class HomeStatusBarInteractor

@Inject

constructor(

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ constructor( 
    override val statusBarBoundsViewModelFactory: StatusBarBoundsViewModel.Factory,

    override val appHandlesViewModelFactory: AppHandlesViewModel.Factory,

    tableLoggerFactory: TableLogBufferFactory,

    homeStatusBarInteractor: HomeStatusBarInteractor,

    @DisplayAware homeStatusBarInteractor: HomeStatusBarInteractor,

    homeStatusBarIconBlockListInteractor: HomeStatusBarIconBlockListInteractor,

    lightsOutInteractor: LightsOutInteractor,

    notificationsInteractor: ActiveNotificationsInteractor,