Inline notif pipeline flag into NotifController
This change is a no-op; the flag is now enabled-by-default, so all removed code paths here are effectively dead. Bug: 200269355 Test: atest SystemUITests Change-Id: I1aa582cd30b43f5fc9f720b67e37cfa9e6460f5e Merged-In: I1aa582cd30b43f5fc9f720b67e37cfa9e6460f5e
This commit is contained in:
@@ -23,31 +23,22 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.Snoo
|
||||
import com.android.systemui.statusbar.NotificationListener
|
||||
import com.android.systemui.statusbar.NotificationPresenter
|
||||
import com.android.systemui.statusbar.notification.AnimatedImageNotificationManager
|
||||
import com.android.systemui.statusbar.notification.NotifPipelineFlags
|
||||
import com.android.systemui.statusbar.notification.NotificationActivityStarter
|
||||
import com.android.systemui.statusbar.notification.NotificationClicker
|
||||
import com.android.systemui.statusbar.notification.NotificationEntryManager
|
||||
import com.android.systemui.statusbar.notification.NotificationListController
|
||||
import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore
|
||||
import com.android.systemui.statusbar.notification.collection.NotifPipeline
|
||||
import com.android.systemui.statusbar.notification.collection.NotificationRankingManager
|
||||
import com.android.systemui.statusbar.notification.collection.TargetSdkResolver
|
||||
import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl
|
||||
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl
|
||||
import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer
|
||||
import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy
|
||||
import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
|
||||
import com.android.systemui.statusbar.notification.collection.provider.DebugModeFilterProvider
|
||||
import com.android.systemui.statusbar.notification.collection.render.NotifStackController
|
||||
import com.android.systemui.statusbar.notification.interruption.HeadsUpController
|
||||
import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder
|
||||
import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer
|
||||
import com.android.systemui.statusbar.notification.stack.NotificationListContainer
|
||||
import com.android.systemui.statusbar.phone.CentralSurfaces
|
||||
import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper
|
||||
import com.android.systemui.statusbar.policy.DeviceProvisionedController
|
||||
import com.android.systemui.statusbar.policy.HeadsUpManager
|
||||
import com.android.systemui.statusbar.policy.RemoteInputUriController
|
||||
import com.android.wm.shell.bubbles.Bubbles
|
||||
import dagger.Lazy
|
||||
import java.io.PrintWriter
|
||||
@@ -64,30 +55,21 @@ 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,
|
||||
private val debugModeFilterProvider: DebugModeFilterProvider,
|
||||
private val legacyRanker: NotificationRankingManager,
|
||||
private val commonNotifCollection: Lazy<CommonNotifCollection>,
|
||||
private val notifPipeline: Lazy<NotifPipeline>,
|
||||
private val notifLiveDataStore: NotifLiveDataStore,
|
||||
private val targetSdkResolver: TargetSdkResolver,
|
||||
private val newNotifPipelineInitializer: Lazy<NotifPipelineInitializer>,
|
||||
private val notifPipelineInitializer: Lazy<NotifPipelineInitializer>,
|
||||
private val notifBindPipelineInitializer: NotifBindPipelineInitializer,
|
||||
private val deviceProvisionedController: DeviceProvisionedController,
|
||||
private val notificationRowBinder: NotificationRowBinderImpl,
|
||||
private val bindEventManagerImpl: BindEventManagerImpl,
|
||||
private val remoteInputUriController: RemoteInputUriController,
|
||||
private val groupManagerLegacy: Lazy<NotificationGroupManagerLegacy>,
|
||||
private val groupAlertTransferHelper: NotificationGroupAlertTransferHelper,
|
||||
private val headsUpManager: HeadsUpManager,
|
||||
private val headsUpController: HeadsUpController,
|
||||
private val headsUpViewBinder: HeadsUpViewBinder,
|
||||
private val clickerBuilder: NotificationClicker.Builder,
|
||||
private val animatedImageNotificationManager: AnimatedImageNotificationManager,
|
||||
private val peopleSpaceWidgetManager: PeopleSpaceWidgetManager,
|
||||
private val bubblesOptional: Optional<Bubbles>
|
||||
private val bubblesOptional: Optional<Bubbles>,
|
||||
) : NotificationsController {
|
||||
|
||||
override fun initialize(
|
||||
@@ -118,33 +100,13 @@ class NotificationsControllerImpl @Inject constructor(
|
||||
notifBindPipelineInitializer.initialize()
|
||||
animatedImageNotificationManager.bind()
|
||||
|
||||
if (INITIALIZE_NEW_PIPELINE) {
|
||||
newNotifPipelineInitializer.get().initialize(
|
||||
notificationListener,
|
||||
notificationRowBinder,
|
||||
listContainer,
|
||||
stackController)
|
||||
}
|
||||
notifPipelineInitializer.get().initialize(
|
||||
notificationListener,
|
||||
notificationRowBinder,
|
||||
listContainer,
|
||||
stackController)
|
||||
|
||||
if (notifPipelineFlags.isNewPipelineEnabled()) {
|
||||
targetSdkResolver.initialize(notifPipeline.get())
|
||||
// TODO
|
||||
} else {
|
||||
targetSdkResolver.initialize(entryManager)
|
||||
remoteInputUriController.attach(entryManager)
|
||||
groupAlertTransferHelper.bind(entryManager, groupManagerLegacy.get())
|
||||
bindEventManagerImpl.attachToLegacyPipeline(entryManager)
|
||||
headsUpManager.addListener(groupManagerLegacy.get())
|
||||
headsUpManager.addListener(groupAlertTransferHelper)
|
||||
headsUpController.attach(entryManager, headsUpManager)
|
||||
groupManagerLegacy.get().setHeadsUpManager(headsUpManager)
|
||||
groupAlertTransferHelper.setHeadsUpManager(headsUpManager)
|
||||
debugModeFilterProvider.registerInvalidationListener {
|
||||
entryManager.updateNotifications("debug mode filter changed")
|
||||
}
|
||||
|
||||
entryManager.initialize(notificationListener, legacyRanker)
|
||||
}
|
||||
targetSdkResolver.initialize(notifPipeline.get())
|
||||
|
||||
peopleSpaceWidgetManager.attach(notificationListener)
|
||||
}
|
||||
@@ -185,9 +147,4 @@ class NotificationsControllerImpl @Inject constructor(
|
||||
|
||||
override fun getActiveNotificationsCount(): Int =
|
||||
notifLiveDataStore.activeNotifCount.value
|
||||
|
||||
companion object {
|
||||
// NOTE: The new pipeline is always active, even if the old pipeline is *rendering*.
|
||||
private const val INITIALIZE_NEW_PIPELINE = true
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user