Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1623282 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I9bc1d3a9c3e63ec87548ed180978d6a1d62dd9c7
parents ac2fa455 614b1e94

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.plugins.qs.QSFactory; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;

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.tileimpl.QSFactoryImpl;

import com.android.systemui.recents.Recents;
@@ -80,6 +81,7 @@ import dagger.Provides; 
 */

@Module(includes = {

        MediaModule.class,

        PowerModule.class,

        QSModule.class

})

public abstract class SystemUIDefaultModule {

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

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.log.dagger.LogModule; 
import com.android.systemui.model.SysUiState;

import com.android.systemui.plugins.BcSmartspaceDataPlugin;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.dagger.PowerModule;

import com.android.systemui.recents.Recents;

import com.android.systemui.screenshot.dagger.ScreenshotModule;

import com.android.systemui.settings.dagger.SettingsModule;
@@ -102,7 +101,6 @@ import dagger.Provides; 
            FalsingModule.class,

            LogModule.class,

            PeopleHubModule.class,

            PowerModule.class,

            PluginModule.class,

            ScreenshotModule.class,

            SensorModule.class,

packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.plugins.qs.QSFactory; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;

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.tileimpl.QSFactoryImpl;

import com.android.systemui.recents.Recents;
@@ -81,6 +82,7 @@ import dagger.Provides; 
 * overridden by the System UI implementation.

 */

@Module(includes = {

            PowerModule.class,

            QSModule.class

        },

        subcomponents = {