Merge "[flexiglass] Deletes SceneContainerStartable from main." into main (18092cb1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSysUIComponent.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.dagger;

		import com.android.systemui.globalactions.ShutdownUiModule;
		import com.android.systemui.keyguard.CustomizationProvider;
		import com.android.systemui.scene.startable.SceneContainerStartableModule;
		import com.android.systemui.shade.ShadeModule;
		import com.android.systemui.statusbar.NotificationInsetsModule;
		import com.android.systemui.statusbar.QsFrameTranslateModule;
		@@ -36,7 +35,6 @@ import dagger.Subcomponent;
		QsFrameTranslateModule.class,
		ShadeModule.class,
		ShutdownUiModule.class,
		SceneContainerStartableModule.class,
		SystemUIBinder.class,
		SystemUIModule.class,
		SystemUICoreStartableModule.class,

packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.scene

		import com.android.systemui.scene.domain.startable.SceneContainerStartableModule
		import com.android.systemui.scene.shared.model.SceneContainerConfigModule
		import com.android.systemui.scene.ui.composable.SceneModule
		import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModelModule
		@@ -26,7 +25,6 @@ import dagger.Module
		includes =
		[
		SceneContainerConfigModule::class,
		SceneContainerStartableModule::class,
		SceneContainerViewModelModule::class,
		SceneModule::class,
		],

packages/SystemUI/src/com/android/systemui/scene/startable/SceneContainerStartable.kt

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		* Copyright 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.scene.startable

		import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.scene.shared.model.Scene
		import com.android.systemui.scene.shared.model.SceneContainerConfig
		import com.android.systemui.scene.shared.model.SceneContainerNames
		import com.android.systemui.scene.ui.view.SceneWindowRootView
		import com.android.systemui.scene.ui.view.WindowRootView
		import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel
		import dagger.Binds
		import dagger.Module
		import dagger.multibindings.ClassKey
		import dagger.multibindings.IntoMap
		import javax.inject.Inject
		import javax.inject.Named

		@SysUISingleton
		class SceneContainerStartable
		@Inject
		constructor(
		private val view: WindowRootView,
		@Named(SceneContainerNames.SYSTEM_UI_DEFAULT) private val viewModel: SceneContainerViewModel,
		@Named(SceneContainerNames.SYSTEM_UI_DEFAULT) private val containerConfig: SceneContainerConfig,
		@Named(SceneContainerNames.SYSTEM_UI_DEFAULT)
		private val scenes: Set<@JvmSuppressWildcards Scene>,
		) : CoreStartable {

		override fun start() {
		(view as? SceneWindowRootView)?.init(
		viewModel = viewModel,
		containerConfig = containerConfig,
		scenes = scenes,
		)
		}
		}

		@Module
		interface SceneContainerStartableModule {
		@Binds
		@IntoMap
		@ClassKey(SceneContainerStartable::class)
		fun bind(impl: SceneContainerStartable): CoreStartable
		}