diff options
| author | 2024-10-24 17:36:59 +0000 | |
|---|---|---|
| committer | 2024-10-24 17:46:14 +0000 | |
| commit | a061bae4a8ee94a458d8da0a33409b7ae4da999b (patch) | |
| tree | 6328287da270e1490e588107f75f5c88c4bf877b | |
| parent | 7c3e87f5932a597f157e358540a9e280f45763df (diff) | |
[CS] Move EmergencyGestureModule to top-level modules not CSModule.
While `CentralSurfacesModule` *looks* like it should include all the
classes that CentralSurfaces depends on, it turns out that's not
actually the case. As long as the top-level module has those classes,
everything compiles.
This helps keep `CentralSurfacesModule` focused on just @Providing
CentralSurfaces and nothing else.
Bug: 277764509
Test: SysUI, SysUIGoogle, and SysUIGo compile
Flag: EXEMPT refactor
Change-Id: Iba9850441761db3c0ed88edee2b5e50de533453b
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java index c6be0dd76a06..b966ad47053d 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java @@ -35,6 +35,7 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.dock.DockManagerImpl; import com.android.systemui.doze.DozeHost; import com.android.systemui.education.dagger.ContextualEducationModule; +import com.android.systemui.emergency.EmergencyGestureModule; import com.android.systemui.inputdevice.tutorial.KeyboardTouchpadTutorialModule; import com.android.systemui.keyboard.shortcut.ShortcutHelperModule; import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule; @@ -123,6 +124,7 @@ import javax.inject.Named; CollapsedStatusBarFragmentStartableModule.class, ConnectingDisplayViewModel.StartableModule.class, DefaultBlueprintModule.class, + EmergencyGestureModule.class, GestureModule.class, HeadsUpModule.class, KeyboardShortcutsModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java index 525f3defa15c..72cd63f3ae62 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java @@ -17,7 +17,6 @@ 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; @@ -32,7 +31,7 @@ import dagger.Module; */ @Module(includes = {CentralSurfacesDependenciesModule.class, StatusBarNotificationPresenterModule.class, - NotificationsModule.class, NotificationRowModule.class, EmergencyGestureModule.class}) + NotificationsModule.class, NotificationRowModule.class}) public interface CentralSurfacesModule { /** * Provides our instance of CentralSurfaces which is considered optional. |