diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackOptionalModule.kt (renamed from packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackModule.kt) | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java index 3c68e3a09f02..8bff090959ab 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java @@ -74,6 +74,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.dagger.CentralSurfacesModule; import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule; +import com.android.systemui.statusbar.notification.dagger.NotificationStackModule; import com.android.systemui.statusbar.notification.dagger.ReferenceNotificationsModule; import com.android.systemui.statusbar.notification.headsup.HeadsUpModule; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -169,6 +170,7 @@ import javax.inject.Named; WallpaperModule.class, ShortcutHelperModule.class, ContextualEducationModule.class, + NotificationStackModule.class, }) public abstract class ReferenceSystemUIModule { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackOptionalModule.kt index 6ceeb6aae7a5..bcaf1878a869 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackOptionalModule.kt @@ -26,7 +26,7 @@ import dagger.Module * This is meant to be bound in SystemUI variants with [NotificationStackScrollLayoutController]. */ @Module -interface NotificationStackGoogleModule { +interface NotificationStackModule { @Binds fun bindNotificationStackRebindingHider( impl: NotificationStackRebindingHiderImpl @@ -35,7 +35,7 @@ interface NotificationStackGoogleModule { /** This is meant to be used by all SystemUI variants, also those without NSSL. */ @Module -interface NotificationStackModule { +interface NotificationStackOptionalModule { @BindsOptionalOf fun bindOptionalOfNotificationStackRebindingHider(): NotificationStackRebindingHider } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java index e10825bc52fe..34f4969127e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java @@ -121,7 +121,7 @@ import javax.inject.Provider; NotificationMemoryModule.class, NotificationStatsLoggerModule.class, NotificationsLogModule.class, - NotificationStackModule.class, + NotificationStackOptionalModule.class, }) public interface NotificationsModule { @Binds |