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

Commit cfff25e8 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Move CentralSurface into initialize()."

parents 53ddd075 35d0b335

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.statusbar.notification.NotificationActivityStarter 
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl

import com.android.systemui.statusbar.notification.collection.render.NotifStackController

import com.android.systemui.statusbar.notification.stack.NotificationListContainer

import com.android.systemui.statusbar.phone.CentralSurfaces

import java.io.PrintWriter



/**
@@ -33,6 +34,7 @@ import java.io.PrintWriter 
 */

interface NotificationsController {

    fun initialize(

        centralSurfaces: CentralSurfaces,

        presenter: NotificationPresenter,

        listContainer: NotificationListContainer,

        stackController: NotifStackController,

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import javax.inject.Inject 
 */

@SysUISingleton

class NotificationsControllerImpl @Inject constructor(

    private val centralSurfaces: Lazy<CentralSurfaces>,

    private val notifPipelineFlags: NotifPipelineFlags,

    private val notificationListener: NotificationListener,

    private val entryManager: NotificationEntryManager,
@@ -91,6 +90,7 @@ class NotificationsControllerImpl @Inject constructor( 
) : NotificationsController {



    override fun initialize(

        centralSurfaces: CentralSurfaces,

        presenter: NotificationPresenter,

        listContainer: NotificationListContainer,

        stackController: NotifStackController,
@@ -108,8 +108,8 @@ class NotificationsControllerImpl @Inject constructor( 


        notificationRowBinder.setNotificationClicker(

                clickerBuilder.build(

                    Optional.of(

                        centralSurfaces.get()), bubblesOptional, notificationActivityStarter))

                    Optional.ofNullable(centralSurfaces), bubblesOptional,

                        notificationActivityStarter))

        notificationRowBinder.setUpWithPresenter(

                presenter,

                listContainer,

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.systemui.statusbar.notification.NotificationActivityStarter 
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl

import com.android.systemui.statusbar.notification.collection.render.NotifStackController

import com.android.systemui.statusbar.notification.stack.NotificationListContainer

import com.android.systemui.statusbar.phone.CentralSurfaces

import java.io.PrintWriter

import javax.inject.Inject
@@ -35,6 +36,7 @@ class NotificationsControllerStub @Inject constructor( 
) : NotificationsController {



    override fun initialize(

        centralSurfaces: CentralSurfaces,

        presenter: NotificationPresenter,

        listContainer: NotificationListContainer,

        stackController: NotifStackController,

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,7 @@ public class CentralSurfacesImpl extends CoreStartable implements 
        mStackScrollerController.setNotificationActivityStarter(mNotificationActivityStarter);

        mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);

        mNotificationsController.initialize(

                this,

                mPresenter,

                mNotifListContainer,

                mStackScrollerController.getNotifStackController(),