Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove empty modules" into tm-dev

Browse Source
This commit is contained in:
Peter Kalauskas
2022-03-04 16:48:33 +00:00
committed by Android (Google) Code Review
parent 22c3bb0c72 89f721ba69
commit 2c898c3edb
5 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/dagger/GlobalRootComponent.java
View File

@@ -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();
}

26
packages/SystemUI/src/com/android/systemui/dagger/SysUISubcomponentModule.java
View File

@@ -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 {
}

26
packages/SystemUI/src/com/android/systemui/dagger/WMModule.java
View File

@@ -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 {
}

10
packages/SystemUI/src/com/android/systemui/tv/TvGlobalRootComponent.java
View File

@@ -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();

26
packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponentModule.java
View File

@@ -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 {
}