Merge Android 14 QPR1

Merged-In: Ib26cc2b0b74306bb48f4347db5f7c4548f08a9c9
Bug: 315507370
Change-Id: Ia17b04927b311565320b90ca3def9512d6d8ae9a

2 files changed, 26 insertions, 5 deletions

diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
index a7f4a9c..6b6c948 100644
--- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
+++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
@@ -35,6 +35,9 @@ 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;
 import com.android.systemui.toast.ToastUI;
 import com.android.systemui.usb.StorageNotification;
@@ -195,4 +198,21 @@ abstract class SystemUIGoCoreStartableModule {
     @IntoMap
     @ClassKey(WMShell.class)
     abstract CoreStartable bindWMShell(WMShell wmShell);
+
+    /** Inject into LocskcreenWallpaper. */
+    @Binds
+    @IntoMap
+    @ClassKey(LockscreenWallpaper.class)
+    abstract CoreStartable bindLockscreenWallpaper(LockscreenWallpaper lockscreenWallpaper);
+
+    /** Inject into ScrimController. */
+    @Binds
+    @IntoMap
+    @ClassKey(ScrimController.class)
+    abstract CoreStartable bindScrimController(ScrimController scrimController);
+
+    @Binds
+    @IntoMap
+    @ClassKey(StatusBarHeadsUpChangeListener.class)
+    abstract CoreStartable bindStatusBarHeadsUpChangeListener(StatusBarHeadsUpChangeListener impl);
 }
diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java
index 5ca4db2..0843d3a 100644
--- a/src/com/android/systemui/go/SystemUIGoModule.java
+++ b/src/com/android/systemui/go/SystemUIGoModule.java
@@ -32,6 +32,7 @@ import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dock.DockManager;
 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.gestural.GestureModule;
 import com.android.systemui.plugins.qs.QSFactory;
@@ -44,9 +45,8 @@ import com.android.systemui.recents.RecentsImplementation;
 import com.android.systemui.screenshot.ReferenceScreenshotModule;
 import com.android.systemui.settings.dagger.MultiUserUtilsModule;
 import com.android.systemui.shade.NotificationShadeWindowControllerImpl;
-import com.android.systemui.shade.ShadeController;
-import com.android.systemui.shade.ShadeControllerImpl;
 import com.android.systemui.shade.ShadeExpansionStateManager;
+import com.android.systemui.shade.ShadeModule;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
@@ -71,6 +71,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerIm
 import com.android.systemui.statusbar.policy.SensorPrivacyController;
 import com.android.systemui.statusbar.policy.SensorPrivacyControllerImpl;
 import com.android.systemui.volume.dagger.VolumeModule;
+import com.android.systemui.wallpapers.dagger.WallpaperModule;
 
 import javax.inject.Named;
 
@@ -90,8 +91,11 @@ import dagger.Provides;
         PowerModule.class,
         QSModule.class,
         ReferenceScreenshotModule.class,
+        ShadeModule.class,
+        ShutdownUiModule.class,
         StartCentralSurfacesModule.class,
         StatusBarEventsModule.class,
+        WallpaperModule.class,
         VolumeModule.class
 })
 public abstract class SystemUIGoModule {
@@ -137,9 +141,6 @@ public abstract class SystemUIGoModule {
     @Binds
     abstract DockManager bindDockManager(DockManagerImpl dockManager);
 
-    @Binds
-    abstract ShadeController provideShadeController(ShadeControllerImpl shadeController);
-
     @SysUISingleton
     @Provides
     @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)