diff options
3 files changed, 26 insertions, 45 deletions
diff --git a/src/com/android/systemui/go/SystemUIGoComponent.java b/src/com/android/systemui/go/SystemUIGoComponent.java index 78b25f7..1b67cd6 100644 --- a/src/com/android/systemui/go/SystemUIGoComponent.java +++ b/src/com/android/systemui/go/SystemUIGoComponent.java @@ -26,6 +26,7 @@ import com.android.systemui.dagger.SystemUIModule; import com.android.systemui.keyguard.dagger.KeyguardModule; import com.android.systemui.keyguard.CustomizationProvider; import com.android.systemui.recents.RecentsModule; +import com.android.systemui.scene.SceneContainerFrameworkModule; import com.android.systemui.statusbar.dagger.CentralSurfacesModule; import com.android.systemui.statusbar.NotificationInsetsModule; import com.android.systemui.statusbar.QsFrameTranslateModule; @@ -45,6 +46,7 @@ import dagger.Subcomponent; SystemUIGoCoreStartableModule.class, KeyguardModule.class, RecentsModule.class, + SceneContainerFrameworkModule.class, CentralSurfacesModule.class, NotificationInsetsModule.class, QsFrameTranslateModule.class, diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index 6b6c948..1c666ed 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -22,12 +22,14 @@ import com.android.systemui.LatencyTester; import com.android.systemui.ScreenDecorations; import com.android.systemui.SliceBroadcastRelayHandler; import com.android.systemui.accessibility.SystemActions; -import com.android.systemui.accessibility.WindowMagnification; +import com.android.systemui.accessibility.Magnification; +import com.android.systemui.back.domain.interactor.BackActionInteractor; import com.android.systemui.biometrics.AuthController; import com.android.systemui.clipboardoverlay.ClipboardListener; import com.android.systemui.dagger.qualifiers.PerUser; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyboard.KeyboardUI; +import com.android.systemui.keyguard.KeyguardViewConfigurator; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.log.SessionTracker; import com.android.systemui.media.RingtonePlayer; @@ -35,7 +37,6 @@ import com.android.systemui.power.PowerUI; import com.android.systemui.recents.Recents; import com.android.systemui.shortcut.ShortcutKeyDispatcher; import com.android.systemui.statusbar.notification.InstantAppNotifier; -import com.android.systemui.statusbar.phone.LockscreenWallpaper; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.StatusBarHeadsUpChangeListener; import com.android.systemui.theme.ThemeOverlayController; @@ -187,11 +188,11 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(VolumeUI.class) abstract CoreStartable bindVolumeUI(VolumeUI volumeUi); - /** Inject into WindowMagnification. */ + /** Inject into Magnification. */ @Binds @IntoMap - @ClassKey(WindowMagnification.class) - abstract CoreStartable bindWindowMagnification(WindowMagnification windowMagnification); + @ClassKey(Magnification.class) + abstract CoreStartable bindMagnification(Magnification magnification); /** Inject into WMShell. */ @Binds @@ -199,11 +200,10 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(WMShell.class) abstract CoreStartable bindWMShell(WMShell wmShell); - /** Inject into LocskcreenWallpaper. */ @Binds @IntoMap - @ClassKey(LockscreenWallpaper.class) - abstract CoreStartable bindLockscreenWallpaper(LockscreenWallpaper lockscreenWallpaper); + @ClassKey(KeyguardViewConfigurator.class) + abstract CoreStartable bindKeyguardViewConfigurator(KeyguardViewConfigurator impl); /** Inject into ScrimController. */ @Binds @@ -215,4 +215,10 @@ abstract class SystemUIGoCoreStartableModule { @IntoMap @ClassKey(StatusBarHeadsUpChangeListener.class) abstract CoreStartable bindStatusBarHeadsUpChangeListener(StatusBarHeadsUpChangeListener impl); + + /** Inject into BackActionInteractor. */ + @Binds + @IntoMap + @ClassKey(BackActionInteractor.class) + abstract CoreStartable bindBackActionInteractor(BackActionInteractor backActionInteractor); } diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 0843d3a..6f9a43a 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -25,6 +25,7 @@ import android.os.Handler; import com.android.internal.logging.UiEventLogger; import com.android.keyguard.KeyguardViewController; +import com.android.systemui.battery.BatterySaverModule; import com.android.systemui.dagger.GlobalRootComponent; import com.android.systemui.dagger.ReferenceSystemUIModule; import com.android.systemui.dagger.SysUISingleton; @@ -34,6 +35,7 @@ import com.android.systemui.dock.DockManagerImpl; import com.android.systemui.doze.DozeHost; import com.android.systemui.globalactions.ShutdownUiModule; import com.android.systemui.media.dagger.MediaModule; +import com.android.systemui.navigationbar.NavigationBarControllerModule; import com.android.systemui.navigationbar.gestural.GestureModule; import com.android.systemui.plugins.qs.QSFactory; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -42,6 +44,7 @@ import com.android.systemui.qs.dagger.QSModule; import com.android.systemui.qs.tileimpl.QSFactoryImpl; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsImplementation; +import com.android.systemui.rotationlock.RotationLockModule; import com.android.systemui.screenshot.ReferenceScreenshotModule; import com.android.systemui.settings.dagger.MultiUserUtilsModule; import com.android.systemui.shade.NotificationShadeWindowControllerImpl; @@ -52,20 +55,18 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule; -import com.android.systemui.statusbar.events.StatusBarEventsModule; import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.phone.DozeServiceHost; -import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; +import com.android.systemui.statusbar.phone.HeadsUpModule; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; +import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule; import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; import com.android.systemui.statusbar.policy.AospPolicyModule; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl; -import com.android.systemui.statusbar.policy.HeadsUpManager; -import com.android.systemui.statusbar.policy.HeadsUpManagerLogger; import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController; import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerImpl; import com.android.systemui.statusbar.policy.SensorPrivacyController; @@ -85,16 +86,20 @@ import dagger.Provides; */ @Module(includes = { AospPolicyModule.class, + BatterySaverModule.class, + CollapsedStatusBarFragmentStartableModule.class, GestureModule.class, + HeadsUpModule.class, MediaModule.class, MultiUserUtilsModule.class, + NavigationBarControllerModule.class, PowerModule.class, QSModule.class, ReferenceScreenshotModule.class, + RotationLockModule.class, ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, - StatusBarEventsModule.class, WallpaperModule.class, VolumeModule.class }) @@ -148,38 +153,6 @@ public abstract class SystemUIGoModule { return true; } - @SysUISingleton - @Provides - static HeadsUpManagerPhone provideHeadsUpManagerPhone( - Context context, - HeadsUpManagerLogger headsUpManagerLogger, - StatusBarStateController statusBarStateController, - KeyguardBypassController bypassController, - GroupMembershipManager groupManager, - VisualStabilityProvider visualStabilityProvider, - ConfigurationController configurationController, - @Main Handler handler, - AccessibilityManagerWrapper accessibilityManagerWrapper, - UiEventLogger uiEventLogger, - ShadeExpansionStateManager shadeExpansionStateManager) { - return new HeadsUpManagerPhone( - context, - headsUpManagerLogger, - statusBarStateController, - bypassController, - groupManager, - visualStabilityProvider, - configurationController, - handler, - accessibilityManagerWrapper, - uiEventLogger, - shadeExpansionStateManager - ); - } - - @Binds - abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone); - @Provides @SysUISingleton static Recents provideRecents(Context context, RecentsImplementation recentsImplementation, |