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

Commit e6484f7d authored by Chris Göllner's avatar Chris Göllner
Browse files

Move StatusBarRootFactory into SystemUIPhoneDisplaySubcomponent 

Test: Build & Run
Flag: EXEMPT Dagger change that can't be flagged
Fixes: 425631245
Change-Id: Id6bed8171227d26a14533e4a33faee6bbe218623
parent efab0d40

packages/SystemUI/src/com/android/systemui/display/dagger/PerDisplayCommonModule.kt

+18 −0
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ import com.android.systemui.display.data.repository.DisplayStateRepository 
import com.android.systemui.display.data.repository.DisplayStateRepositoryImpl

import com.android.systemui.display.domain.interactor.DisplayStateInteractor

import com.android.systemui.display.domain.interactor.DisplayStateInteractorImpl

import com.android.systemui.plugins.DarkIconDispatcher

import com.android.systemui.statusbar.dagger.StatusBarPerDisplayModule

import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStore

import com.android.systemui.statusbar.pipeline.shared.ui.composable.StatusBarRootFactory

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -55,7 +58,22 @@ interface PerDisplayCommonModule { 
    @DisplayAware

    fun bindsDisplayStateInteractor(impl: DisplayStateInteractorImpl): DisplayStateInteractor



    @Binds

    @DisplayAware

    fun statusBarRootFactory(statusBarRootFactory: StatusBarRootFactory): StatusBarRootFactory



    companion object {

        @Provides

        @PerDisplaySingleton

        @DisplayAware

        fun darkIconDispatcher(

            @DisplayId displayId: Int,

            darkIconDispatcherStore: DarkIconDispatcherStore,

        ): DarkIconDispatcher {

            return darkIconDispatcherStore.forDisplay(displayId)

                ?: error("No DarkIconDispatcher for display $displayId")

        }



        @Provides

        @PerDisplaySingleton

        fun provideDisplay(

packages/SystemUI/src/com/android/systemui/display/dagger/SystemUIPhoneDisplaySubcomponent.kt

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDispla 
import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment

import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent

import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder

import com.android.systemui.statusbar.pipeline.shared.ui.composable.StatusBarRootFactory

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.HomeStatusBarViewModelFactory

import dagger.BindsInstance

import dagger.Subcomponent
@@ -59,6 +60,8 @@ interface SystemUIPhoneDisplaySubcomponent : SystemUIDisplaySubcomponent { 


    @get:DisplayAware val homeStatusBarViewBinder: HomeStatusBarViewBinder



    @get:DisplayAware val statusBarRootFactory: StatusBarRootFactory



    @Subcomponent.Factory

    interface Factory : SystemUIDisplaySubcomponent.Factory {

        override fun create(

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

+3 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ interface StatusBarInitializer : CoreStartable { 
            statusBarConfigurationController: StatusBarConfigurationController,

            darkIconDispatcher: DarkIconDispatcher,

            collapsedStatusBarFragmentProvider: Provider<CollapsedStatusBarFragment>,

            statusBarRootFactory: StatusBarRootFactory,

            componentFactory: HomeStatusBarComponent.Factory,

        ): StatusBarInitializer

    }
@@ -98,7 +99,7 @@ constructor( 
    @Assisted private val statusBarConfigurationController: StatusBarConfigurationController,

    @Assisted private val darkIconDispatcher: DarkIconDispatcher,

    @Assisted private val collapsedStatusBarFragmentProvider: Provider<CollapsedStatusBarFragment>,

    private val statusBarRootFactory: StatusBarRootFactory,

    @Assisted private val statusBarRootFactory: StatusBarRootFactory,

    @Assisted private val componentFactory: HomeStatusBarComponent.Factory,

    private val lifecycleListeners: Set<@JvmSuppressWildcards StatusBarViewLifecycleListener>,

) : StatusBarInitializer {
@@ -227,6 +228,7 @@ constructor( 
            statusBarConfigurationController: StatusBarConfigurationController,

            darkIconDispatcher: DarkIconDispatcher,

            collapsedStatusBarFragmentProvider: Provider<CollapsedStatusBarFragment>,

            statusBarRootFactory: StatusBarRootFactory,

            componentFactory: HomeStatusBarComponent.Factory,

        ): StatusBarInitializerImpl

    }

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializerStore.kt

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ constructor( 
            statusBarConfigurationController,

            darkIconDispatcher,

            displaySubComponent.statusBarFragmentProvider,

            displaySubComponent.statusBarRootFactory,

            displaySubComponent.homeStatusBarComponentFactory,

        )

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ interface StatusBarPhoneModule { 
                statusBarConfigurationControllerStore.defaultDisplay,

                darkIconDispatcherStore.defaultDisplay,

                systemUIDisplaySubcomponent.statusBarFragmentProvider,

                systemUIDisplaySubcomponent.statusBarRootFactory,

                systemUIDisplaySubcomponent.homeStatusBarComponentFactory,

            )

        }