Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: 603d1bddab (2be9c140) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -28,10 +28,9 @@ import javax.inject.Singleton

	@Singleton		@Singleton
	class TargetSdkResolver @Inject constructor(		class TargetSdkResolver @Inject constructor(
	private val context: Context,		private val context: Context
	private val collection: CommonNotifCollection
	) {		) {
	init {		fun initialize(collection: CommonNotifCollection) {
	collection.addCollectionListener(object : NotifCollectionListener {		collection.addCollectionListener(object : NotifCollectionListener {
	override fun onEntryBind(entry: NotificationEntry, sbn: StatusBarNotification) {		override fun onEntryBind(entry: NotificationEntry, sbn: StatusBarNotification) {
	entry.targetSdk = resolveNotificationSdk(sbn)		entry.targetSdk = resolveNotificationSdk(sbn)

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,10 @@ import com.android.systemui.statusbar.notification.NotificationActivityStarter
	import com.android.systemui.statusbar.notification.NotificationClicker		import com.android.systemui.statusbar.notification.NotificationClicker
	import com.android.systemui.statusbar.notification.NotificationEntryManager		import com.android.systemui.statusbar.notification.NotificationEntryManager
	import com.android.systemui.statusbar.notification.NotificationListController		import com.android.systemui.statusbar.notification.NotificationListController
			import com.android.systemui.statusbar.notification.collection.NotifPipeline
	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.init.NotifPipelineInitializer		import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer
			import com.android.systemui.statusbar.notification.collection.TargetSdkResolver
	import com.android.systemui.statusbar.notification.interruption.HeadsUpController		import com.android.systemui.statusbar.notification.interruption.HeadsUpController
	import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer		import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer
	import com.android.systemui.statusbar.notification.stack.NotificationListContainer		import com.android.systemui.statusbar.notification.stack.NotificationListContainer
	@@ -56,6 +58,8 @@ class NotificationsControllerImpl @Inject constructor(
	private val featureFlags: FeatureFlags,		private val featureFlags: FeatureFlags,
	private val notificationListener: NotificationListener,		private val notificationListener: NotificationListener,
	private val entryManager: NotificationEntryManager,		private val entryManager: NotificationEntryManager,
			private val notifPipeline: Lazy<NotifPipeline>,
			private val targetSdkResolver: TargetSdkResolver,
	private val newNotifPipeline: Lazy<NotifPipelineInitializer>,		private val newNotifPipeline: Lazy<NotifPipelineInitializer>,
	private val notifBindPipelineInitializer: NotifBindPipelineInitializer,		private val notifBindPipelineInitializer: NotifBindPipelineInitializer,
	private val deviceProvisionedController: DeviceProvisionedController,		private val deviceProvisionedController: DeviceProvisionedController,
	@@ -102,8 +106,10 @@ class NotificationsControllerImpl @Inject constructor(
	}		}

	if (featureFlags.isNewNotifPipelineRenderingEnabled) {		if (featureFlags.isNewNotifPipelineRenderingEnabled) {
			targetSdkResolver.initialize(notifPipeline.get())
	// TODO		// TODO
	} else {		} else {
			targetSdkResolver.initialize(entryManager)
	remoteInputUriController.attach(entryManager)		remoteInputUriController.attach(entryManager)
	groupAlertTransferHelper.bind(entryManager, groupManager)		groupAlertTransferHelper.bind(entryManager, groupManager)
	headsUpManager.addListener(groupManager)		headsUpManager.addListener(groupManager)