Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move CentralSurface into initialize()." into tm-qpr-dev am: 49c7078a7b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20246306

Change-Id: I1efb6f64a684acfa84797b34558f3610b01c0013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Tuttle
2022-10-21 18:05:57 +00:00
committed by Automerger Merge Worker
parent 51b868e5ff 49c7078a7b
commit 62f6fe3418
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.inflation.NotificationRowBinderImpl
import com.android.systemui.statusbar.notification.collection.render.NotifStackController import com.android.systemui.statusbar.notification.collection.render.NotifStackController
import com.android.systemui.statusbar.notification.stack.NotificationListContainer import com.android.systemui.statusbar.notification.stack.NotificationListContainer
import com.android.systemui.statusbar.phone.CentralSurfaces
/** /**
* The master controller for all notifications-related work * The master controller for all notifications-related work
@@ -32,6 +33,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationListContain
*/ */
interface NotificationsController { interface NotificationsController {
fun initialize( fun initialize(
centralSurfaces: CentralSurfaces,
presenter: NotificationPresenter, presenter: NotificationPresenter,
listContainer: NotificationListContainer, listContainer: NotificationListContainer,
stackController: NotifStackController, stackController: NotifStackController,

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

@@ -56,7 +56,6 @@ import javax.inject.Inject
*/ */
@SysUISingleton @SysUISingleton
class NotificationsControllerImpl @Inject constructor( class NotificationsControllerImpl @Inject constructor(
private val centralSurfaces: Lazy<CentralSurfaces>,
private val notificationListener: NotificationListener, private val notificationListener: NotificationListener,
private val commonNotifCollection: Lazy<CommonNotifCollection>, private val commonNotifCollection: Lazy<CommonNotifCollection>,
private val notifPipeline: Lazy<NotifPipeline>, private val notifPipeline: Lazy<NotifPipeline>,
@@ -76,6 +75,7 @@ class NotificationsControllerImpl @Inject constructor(
) : NotificationsController { ) : NotificationsController {
override fun initialize( override fun initialize(
centralSurfaces: CentralSurfaces,
presenter: NotificationPresenter, presenter: NotificationPresenter,
listContainer: NotificationListContainer, listContainer: NotificationListContainer,
stackController: NotifStackController, stackController: NotifStackController,
@@ -92,8 +92,8 @@ class NotificationsControllerImpl @Inject constructor(
notificationRowBinder.setNotificationClicker( notificationRowBinder.setNotificationClicker(
clickerBuilder.build( clickerBuilder.build(
Optional.of( Optional.ofNullable(centralSurfaces), bubblesOptional,
centralSurfaces.get()), bubblesOptional, notificationActivityStarter)) notificationActivityStarter))
notificationRowBinder.setUpWithPresenter( notificationRowBinder.setUpWithPresenter(
presenter, presenter,
listContainer, listContainer,

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

@@ -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.inflation.NotificationRowBinderImpl
import com.android.systemui.statusbar.notification.collection.render.NotifStackController import com.android.systemui.statusbar.notification.collection.render.NotifStackController
import com.android.systemui.statusbar.notification.stack.NotificationListContainer import com.android.systemui.statusbar.notification.stack.NotificationListContainer
import com.android.systemui.statusbar.phone.CentralSurfaces
import javax.inject.Inject import javax.inject.Inject
/** /**
@@ -34,6 +35,7 @@ class NotificationsControllerStub @Inject constructor(
) : NotificationsController { ) : NotificationsController {
override fun initialize( override fun initialize(
centralSurfaces: CentralSurfaces,
presenter: NotificationPresenter, presenter: NotificationPresenter,
listContainer: NotificationListContainer, listContainer: NotificationListContainer,
stackController: NotifStackController, stackController: NotifStackController,

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

@@ -1426,6 +1426,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
mStackScrollerController.setNotificationActivityStarter(mNotificationActivityStarter); mStackScrollerController.setNotificationActivityStarter(mNotificationActivityStarter);
mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter); mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);
mNotificationsController.initialize( mNotificationsController.initialize(
this,
mPresenter, mPresenter,
mNotifListContainer, mNotifListContainer,
mStackScrollerController.getNotifStackController(), mStackScrollerController.getNotifStackController(),