Merge "[CS] Remove SystemUIBinder, have modules be directly included." into main (a724469f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/complication/dagger/RegisteredComplicationsModule.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.res.Resources;
		import android.view.ViewGroup;

		import com.android.systemui.complication.ComplicationLayoutParams;
		import com.android.systemui.dagger.SystemUIBinder;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		@@ -32,8 +31,7 @@ import dagger.Provides;
		import javax.inject.Named;

		/**
		* Module for all components with corresponding dream layer complications registered in
		* {@link SystemUIBinder}.
		* Module for all components with corresponding dream layer complications.
		*/
		@Module(
		subcomponents = {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import dagger.Subcomponent;
		DependencyProvider.class,
		NotificationInsetsModule.class,
		QsFrameTranslateModule.class,
		SystemUIBinder.class,
		SystemUIModule.class,
		SystemUICoreStartableModule.class,
		SysUIUnfoldModule.class,

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import com.android.systemui.education.dagger.ContextualEducationModule;
		import com.android.systemui.emergency.EmergencyGestureModule;
		import com.android.systemui.inputdevice.tutorial.KeyboardTouchpadTutorialModule;
		import com.android.systemui.keyboard.shortcut.ShortcutHelperModule;
		import com.android.systemui.keyguard.dagger.KeyguardModule;
		import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule;
		import com.android.systemui.keyguard.ui.view.layout.blueprints.KeyguardBlueprintModule;
		import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule;
		@@ -53,6 +54,7 @@ import com.android.systemui.qs.tileimpl.QSFactoryImpl;
		import com.android.systemui.reardisplay.RearDisplayModule;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.RecentsImplementation;
		import com.android.systemui.recents.RecentsModule;
		import com.android.systemui.rotationlock.RotationLockModule;
		import com.android.systemui.rotationlock.RotationLockNewModule;
		import com.android.systemui.scene.SceneContainerFrameworkModule;
		@@ -68,6 +70,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.dagger.CentralSurfacesModule;
		import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule;
		import com.android.systemui.statusbar.phone.CentralSurfaces;
		import com.android.systemui.statusbar.phone.DozeServiceHost;
		@@ -120,6 +123,7 @@ import javax.inject.Named;
		AccessibilityRepositoryModule.class,
		AospPolicyModule.class,
		BatterySaverModule.class,
		CentralSurfacesModule.class,
		ClipboardOverlaySuppressionModule.class,
		CollapsedStatusBarFragmentStartableModule.class,
		ConnectingDisplayViewModel.StartableModule.class,
		@@ -127,6 +131,7 @@ import javax.inject.Named;
		EmergencyGestureModule.class,
		GestureModule.class,
		HeadsUpModule.class,
		KeyguardModule.class,
		KeyboardShortcutsModule.class,
		KeyguardBlueprintModule.class,
		KeyguardSectionsModule.class,
		@@ -139,6 +144,7 @@ import javax.inject.Named;
		PowerModule.class,
		QSModule.class,
		RearDisplayModule.class,
		RecentsModule.class,
		ReferenceScreenshotModule.class,
		RotationLockModule.class,
		RotationLockNewModule.class,

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ import javax.inject.Provider;
		DependencyProvider.class,
		NotificationInsetsModule.class,
		QsFrameTranslateModule.class,
		SystemUIBinder.class,
		SystemUIModule.class,
		SystemUICoreStartableModule.class,
		ReferenceSystemUIModule.class})

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

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.dagger;

		import com.android.systemui.keyguard.dagger.KeyguardModule;
		import com.android.systemui.recents.RecentsModule;
		import com.android.systemui.statusbar.dagger.CentralSurfacesModule;

		import dagger.Module;

		/**
		* SystemUI objects that are injectable should go here.
		*/
		@Module(includes = {
		RecentsModule.class,
		CentralSurfacesModule.class,
		KeyguardModule.class,
		})
		public abstract class SystemUIBinder {
		}