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

Merge "Actually inject TargetSdkResolver" into rvc-dev

Browse Source
This commit is contained in:
Kevin Han
2020-05-05 23:57:37 +00:00
committed by Android (Google) Code Review
parent 2806da306b 45922c9655
commit 85c3e4d6d2
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -25,8 +25,10 @@ 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.NotifPipeline
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.TargetSdkResolver
import com.android.systemui.statusbar.notification.interruption.HeadsUpController
import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer
import com.android.systemui.statusbar.notification.stack.NotificationListContainer
@@ -56,6 +58,8 @@ class NotificationsControllerImpl @Inject constructor(
private val featureFlags: FeatureFlags,
private val notificationListener: NotificationListener,
private val entryManager: NotificationEntryManager,
private val notifPipeline: Lazy<NotifPipeline>,
private val targetSdkResolver: TargetSdkResolver,
private val newNotifPipeline: Lazy<NotifPipelineInitializer>,
private val notifBindPipelineInitializer: NotifBindPipelineInitializer,
private val deviceProvisionedController: DeviceProvisionedController,
@@ -102,8 +106,10 @@ class NotificationsControllerImpl @Inject constructor(
}
if (featureFlags.isNewNotifPipelineRenderingEnabled) {
targetSdkResolver.initialize(notifPipeline.get())
// TODO
} else {
targetSdkResolver.initialize(entryManager)
remoteInputUriController.attach(entryManager)
groupAlertTransferHelper.bind(entryManager, groupManager)
headsUpManager.addListener(groupManager)