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

Commit 0fb50e83 authored by Evan Laird's avatar Evan Laird
Browse files

[sb] re-claim StatusBarPhoneModule for phones only 

Moved the CentralSurfaces @Bind method to the CentralSurfacesModule, and
removed the inclusion of StatusBarPhoneModule in that module. This
should help us carve out StatusBarPhoneModule for phones only.

Test: build
Flag: EXEMPT refactor
Bug: 364360986
Change-Id: I43e4d755e67c19fd93ee8298c51cbaff73d66d89
parent 5beafc74

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

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import com.android.systemui.statusbar.phone.CentralSurfaces; 
import com.android.systemui.statusbar.phone.DozeServiceHost;

import com.android.systemui.statusbar.phone.HeadsUpModule;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule;

import com.android.systemui.statusbar.policy.AospPolicyModule;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -136,6 +137,7 @@ import javax.inject.Named; 
        RotationLockModule.class,

        RotationLockNewModule.class,

        ScreenDecorationsModule.class,

        StatusBarPhoneModule.class,

        SystemActionsModule.class,

        ShadeModule.class,

        StartCentralSurfacesModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java

+14 −3
Original line number Diff line number Diff line
@@ -16,17 +16,28 @@ 


package com.android.systemui.statusbar.dagger;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.emergency.EmergencyGestureModule;

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

import com.android.systemui.statusbar.notification.row.NotificationRowModule;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.CentralSurfacesImpl;

import com.android.systemui.statusbar.phone.StatusBarNotificationPresenterModule;

import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule;



import dagger.Binds;

import dagger.Module;



/**  */

/**

 * Dagger Module providing {@link CentralSurfacesImpl}.

 */

@Module(includes = {CentralSurfacesDependenciesModule.class,

        StatusBarNotificationPresenterModule.class, StatusBarPhoneModule.class,

        StatusBarNotificationPresenterModule.class,

        NotificationsModule.class, NotificationRowModule.class, EmergencyGestureModule.class})

public interface CentralSurfacesModule {

    /**

     * Provides our instance of CentralSurfaces which is considered optional.

     */

    @Binds

    @SysUISingleton

    CentralSurfaces bindsCentralSurfaces(CentralSurfacesImpl impl);

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java

+1 −12
Original line number Diff line number Diff line
@@ -16,22 +16,11 @@ 


package com.android.systemui.statusbar.phone.dagger;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.CentralSurfacesImpl;



import dagger.Binds;

import dagger.Module;



/**

 * Dagger Module providing {@link CentralSurfacesImpl}.

 * Similar in purpose to [StatusBarModule], but scoped only to phones

 */

@Module

public interface StatusBarPhoneModule {

    /**

     * Provides our instance of CentralSurfaces which is considered optional.

     */

    @Binds

    @SysUISingleton

    CentralSurfaces bindsCentralSurfaces(CentralSurfacesImpl impl);

}