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

Commit 91dbfc66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Provide NotificationStackModule also in aosp" into main

parents e72c176d 011c9431

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

+2 −0
Original line number Diff line number Diff line
@@ -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 {

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackModule.kt→packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationStackOptionalModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -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

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ import javax.inject.Provider; 
        NotificationMemoryModule.class,

        NotificationStatsLoggerModule.class,

        NotificationsLogModule.class,

        NotificationStackModule.class,

        NotificationStackOptionalModule.class,

})

public interface NotificationsModule {

    @Binds