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

Merge "Adjust SystemUI PowerModule" into sc-dev am: 614b1e94ae am: eccdf0ea08

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390769

Change-Id: I171f798165447f0458c9aaff6842fc2208c22213
This commit is contained in:
Wesley Wang
2021-07-30 04:35:00 +00:00
committed by Automerger Merge Worker
parent 3d0da2164e eccdf0ea08
commit ba4b818550
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java
View File

@@ -39,6 +39,7 @@ import com.android.systemui.plugins.qs.QSFactory;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.power.EnhancedEstimates; import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.EnhancedEstimatesImpl; import com.android.systemui.power.EnhancedEstimatesImpl;
import com.android.systemui.power.dagger.PowerModule;
import com.android.systemui.qs.dagger.QSModule; import com.android.systemui.qs.dagger.QSModule;
import com.android.systemui.qs.tileimpl.QSFactoryImpl; import com.android.systemui.qs.tileimpl.QSFactoryImpl;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
@@ -80,6 +81,7 @@ import dagger.Provides;
*/ */
@Module(includes = { @Module(includes = {
MediaModule.class, MediaModule.class,
PowerModule.class,
QSModule.class QSModule.class
}) })
public abstract class SystemUIDefaultModule { public abstract class SystemUIDefaultModule {

2
packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
View File

@@ -41,7 +41,6 @@ import com.android.systemui.log.dagger.LogModule;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.plugins.BcSmartspaceDataPlugin; import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.power.dagger.PowerModule;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
import com.android.systemui.screenshot.dagger.ScreenshotModule; import com.android.systemui.screenshot.dagger.ScreenshotModule;
import com.android.systemui.settings.dagger.SettingsModule; import com.android.systemui.settings.dagger.SettingsModule;
@@ -102,7 +101,6 @@ import dagger.Provides;
FalsingModule.class, FalsingModule.class,
LogModule.class, LogModule.class,
PeopleHubModule.class, PeopleHubModule.class,
PowerModule.class,
PluginModule.class, PluginModule.class,
ScreenshotModule.class, ScreenshotModule.class,
SensorModule.class, SensorModule.class,

2
packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java
View File

@@ -39,6 +39,7 @@ import com.android.systemui.plugins.qs.QSFactory;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.power.EnhancedEstimates; import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.EnhancedEstimatesImpl; import com.android.systemui.power.EnhancedEstimatesImpl;
import com.android.systemui.power.dagger.PowerModule;
import com.android.systemui.qs.dagger.QSModule; import com.android.systemui.qs.dagger.QSModule;
import com.android.systemui.qs.tileimpl.QSFactoryImpl; import com.android.systemui.qs.tileimpl.QSFactoryImpl;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
@@ -81,6 +82,7 @@ import dagger.Provides;
* overridden by the System UI implementation. * overridden by the System UI implementation.
*/ */
@Module(includes = { @Module(includes = {
PowerModule.class,
QSModule.class QSModule.class
}, },
subcomponents = { subcomponents = {