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

Commit c2a3d940 authored by alinazaidi's avatar alinazaidi Committed by Alina Zaidi
Browse files

Move MultiDisplayStatusBarOrchestratorStore CoreStartable provision to StatusBarPhoneModule 

MultiDisplayStatusBarOrchestratorStoreModule wasn't included in build

Bug: 384694270
Flag: com.android.systemui.shared.status_bar_connected_displays
Test: tested locally on device switching external <-> mirroring
Change-Id: Ic65ac9e251379efcb5e63736863f6acf0e24f838
parent 6c8bada5

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

+0 −24
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.statusbar.core



import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.display.data.repository.DisplayRepository
@@ -26,11 +25,6 @@ import com.android.systemui.statusbar.data.repository.StatusBarModeRepositorySto 
import com.android.systemui.statusbar.phone.AutoHideControllerStore

import com.android.systemui.statusbar.window.StatusBarWindowControllerStore

import com.android.systemui.statusbar.window.data.repository.StatusBarWindowStateRepositoryStore

import dagger.Lazy

import dagger.Module

import dagger.Provides

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope
@@ -79,21 +73,3 @@ constructor( 
        instance.stop()

    }

}
 


@Module

interface MultiDisplayStatusBarOrchestratorStoreModule {



    @Provides

    @SysUISingleton

    @IntoMap

    @ClassKey(MultiDisplayStatusBarOrchestratorStore::class)

    fun storeAsCoreStartable(

        multiDisplayLazy: Lazy<MultiDisplayStatusBarOrchestratorStore>

    ): CoreStartable {

        return if (StatusBarConnectedDisplays.isEnabled) {

            multiDisplayLazy.get()

        } else {

            CoreStartable.NOP

        }

    }

}

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

+15 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.systemui.dagger.qualifiers.Default 
import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.core.CommandQueueInitializer

import com.android.systemui.statusbar.core.MultiDisplayStatusBarInitializerStore

import com.android.systemui.statusbar.core.MultiDisplayStatusBarOrchestratorStore

import com.android.systemui.statusbar.core.MultiDisplayStatusBarStarter

import com.android.systemui.statusbar.core.SingleDisplayStatusBarInitializerStore

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays
@@ -197,5 +198,19 @@ interface StatusBarPhoneModule { 
                CoreStartable.NOP

            }

        }



        @Provides

        @SysUISingleton

        @IntoMap

        @ClassKey(MultiDisplayStatusBarOrchestratorStore::class)

        fun orchestratorStoreAsCoreStartable(

            multiDisplayLazy: Lazy<MultiDisplayStatusBarOrchestratorStore>

        ): CoreStartable {

            return if (StatusBarConnectedDisplays.isEnabled) {

                multiDisplayLazy.get()

            } else {

                CoreStartable.NOP

            }

        }

    }

}