Merge "Move MultiDisplayStatusBarOrchestratorStore CoreStartable provision to... (85c5b7d8) · Commits · e / os / android_frameworks_base

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.StatusBarPerDisplayStoreIm
		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

		@@ -83,21 +77,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
		}
		}
		}

+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
		}
		}
		}
		}