From 89f721ba69559a753db170b7ba5b296801a7b6ff Mon Sep 17 00:00:00 2001 From: Peter Kalauskas Date: Wed, 9 Feb 2022 18:24:40 -0800 Subject: [PATCH] Remove empty modules Remove empty WM and SysUI modules because they are unnecessary. The GlobalRootComponent already has builders for the WM and SysUI subcomponents. While the @Modules.subcomponent annotation can be used to optimize the graph, in this case it's not needed because these subcomponents are exposed externally. They are also essential to System UI and cannot be made optional anyway. Bug: 205725937 Test: manual Change-Id: Ibef30bc971c1f296c2d2211a5a30de99cca4d145 --- .../systemui/dagger/GlobalRootComponent.java | 9 +++---- .../dagger/SysUISubcomponentModule.java | 26 ------------------- .../com/android/systemui/dagger/WMModule.java | 26 ------------------- .../systemui/tv/TvGlobalRootComponent.java | 10 +------ .../systemui/tv/TvSysUIComponentModule.java | 26 ------------------- 5 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java delete mode 100644 packages/SystemUI/src/com/android/systemui/dagger/WMModule.java delete mode 100644 packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java diff --git a/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java index a3a45fe7ae40f..4f55ba496b6ba 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java @@ -27,10 +27,7 @@ import dagger.Component; * Root component for Dagger injection. */ @Singleton -@Component(modules = { - GlobalModule.class, - SysUISubcomponentModule.class, - WMModule.class}) +@Component(modules = {GlobalModule.class}) public interface GlobalRootComponent { /** @@ -45,12 +42,12 @@ public interface GlobalRootComponent { } /** - * Builder for a WMComponent. + * Builder for a {@link WMComponent}, which makes it a subcomponent of this class. */ WMComponent.Builder getWMComponentBuilder(); /** - * Builder for a SysUIComponent. + * Builder for a {@link SysUIComponent}, which makes it a subcomponent of this class. */ SysUIComponent.Builder getSysUIComponent(); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java deleted file mode 100644 index aacc6939cf749..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 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 dagger.Module; - -/** - * Dagger module for including the WMComponent. - */ -@Module(subcomponents = {SysUIComponent.class}) -public abstract class SysUISubcomponentModule { -} diff --git a/packages/SystemUI/src/com/android/systemui/dagger/WMModule.java b/packages/SystemUI/src/com/android/systemui/dagger/WMModule.java deleted file mode 100644 index 2894780e04b8f..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/dagger/WMModule.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 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 dagger.Module; - -/** - * Dagger module for including the WMComponent. - */ -@Module(subcomponents = {WMComponent.class}) -public abstract class WMModule { -} diff --git a/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java b/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java index 89ab23b50cd82..117cba7401e95 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java +++ b/packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java @@ -18,7 +18,6 @@ package com.android.systemui.tv; import com.android.systemui.dagger.GlobalModule; import com.android.systemui.dagger.GlobalRootComponent; -import com.android.systemui.dagger.WMModule; import javax.inject.Singleton; @@ -28,11 +27,7 @@ import dagger.Component; * Root component for Dagger injection. */ @Singleton -@Component(modules = { - GlobalModule.class, - TvSysUIComponentModule.class, - WMModule.class -}) +@Component(modules = {GlobalModule.class}) public interface TvGlobalRootComponent extends GlobalRootComponent { /** * Component Builder interface. This allows to bind Context instance in the component @@ -42,9 +37,6 @@ public interface TvGlobalRootComponent extends GlobalRootComponent { TvGlobalRootComponent build(); } - /** - * Builder for a WMComponent. - */ @Override TvWMComponent.Builder getWMComponentBuilder(); diff --git a/packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java b/packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java deleted file mode 100644 index 9621e5f5f1a0b..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 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.tv; - -import dagger.Module; - -/** - * Dagger module for including the SysUIComponent. - */ -@Module(subcomponents = {TvSysUIComponent.class}) -public abstract class TvSysUIComponentModule { -}