Move more initialization logic into NotificationsControllerImpl.
Cherry-picked from ag/18729726. Bug: 234837740 Bug: 243819288 Test: build Change-Id: Icc0adfb16ac4c954e9ea3285630acef0166aae03
This commit is contained in:
@@ -24,6 +24,7 @@ import com.android.systemui.flags.Flags
|
||||
import com.android.systemui.people.widget.PeopleSpaceWidgetManager
|
||||
import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption
|
||||
import com.android.systemui.statusbar.NotificationListener
|
||||
import com.android.systemui.statusbar.NotificationMediaManager
|
||||
import com.android.systemui.statusbar.NotificationPresenter
|
||||
import com.android.systemui.statusbar.notification.AnimatedImageNotificationManager
|
||||
import com.android.systemui.statusbar.notification.NotificationActivityStarter
|
||||
@@ -38,6 +39,7 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.Co
|
||||
import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
|
||||
import com.android.systemui.statusbar.notification.collection.render.NotifStackController
|
||||
import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder
|
||||
import com.android.systemui.statusbar.notification.logging.NotificationLogger
|
||||
import com.android.systemui.statusbar.notification.logging.NotificationMemoryMonitor
|
||||
import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer
|
||||
import com.android.systemui.statusbar.notification.stack.NotificationListContainer
|
||||
@@ -63,7 +65,9 @@ class NotificationsControllerImpl @Inject constructor(
|
||||
private val targetSdkResolver: TargetSdkResolver,
|
||||
private val notifPipelineInitializer: Lazy<NotifPipelineInitializer>,
|
||||
private val notifBindPipelineInitializer: NotifBindPipelineInitializer,
|
||||
private val notificationLogger: NotificationLogger,
|
||||
private val notificationRowBinder: NotificationRowBinderImpl,
|
||||
private val notificationsMediaManager: NotificationMediaManager,
|
||||
private val headsUpViewBinder: HeadsUpViewBinder,
|
||||
private val clickerBuilder: NotificationClicker.Builder,
|
||||
private val animatedImageNotificationManager: AnimatedImageNotificationManager,
|
||||
@@ -109,7 +113,8 @@ class NotificationsControllerImpl @Inject constructor(
|
||||
stackController)
|
||||
|
||||
targetSdkResolver.initialize(notifPipeline.get())
|
||||
|
||||
notificationsMediaManager.setUpWithPresenter(presenter)
|
||||
notificationLogger.setUpWithContainer(listContainer)
|
||||
peopleSpaceWidgetManager.attach(notificationListener)
|
||||
fgsNotifListener.init()
|
||||
if (featureFlags.isEnabled(Flags.NOTIFICATION_MEMORY_MONITOR_ENABLED)) {
|
||||
|
||||
@@ -1136,7 +1136,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
|
||||
|
||||
// TODO: Deal with the ugliness that comes from having some of the status bar broken out
|
||||
// into fragments, but the rest here, it leaves some awkward lifecycle and whatnot.
|
||||
mNotificationLogger.setUpWithContainer(mNotifListContainer);
|
||||
mNotificationIconAreaController.setupShelf(mNotificationShelfController);
|
||||
mShadeExpansionStateManager.addExpansionListener(mWakeUpCoordinator);
|
||||
mUserSwitcherController.init(mNotificationShadeWindowView);
|
||||
|
||||
@@ -179,7 +179,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter,
|
||||
mNotifShadeEventSource.setNotifRemovedByUserCallback(this::maybeEndAmbientPulse);
|
||||
notificationInterruptStateProvider.addSuppressor(mInterruptSuppressor);
|
||||
mLockscreenUserManager.setUpWithPresenter(this);
|
||||
mMediaManager.setUpWithPresenter(this);
|
||||
mGutsManager.setUpWithPresenter(
|
||||
this, mNotifListContainer, mOnSettingsClickListener);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user