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

Merge "Don't require root controllers to have associated views"

Browse Source
This commit is contained in:
Beverly Tai
2020-08-18 13:30:24 +00:00
committed by Android (Google) Code Review
parent 519293857a c0e6ccb8f0
commit 708da23c6f
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt
View File

@@ -25,10 +25,10 @@ import com.android.systemui.statusbar.notification.stack.NotificationListContain
* we should just modify NLC to implement the NodeController interface.
*/
class RootNodeController(
private val listContainer: NotificationListContainer
private val listContainer: NotificationListContainer,
override val view: View
) : NodeController {
override val nodeLabel: String = "<root>"
override val view: View = listContainer as View
override fun getChildAt(index: Int): View? {
return listContainer.getContainerChildAt(index)

15
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.notification.collection.render
import android.content.Context
import android.view.View
import com.android.systemui.statusbar.notification.collection.GroupEntry
import com.android.systemui.statusbar.notification.collection.ListEntry
import com.android.systemui.statusbar.notification.collection.NotificationEntry
@@ -30,12 +32,15 @@ import javax.inject.Inject
* currently populate the notification shade.
*/
class ShadeViewManager constructor(
context: Context,
listContainer: NotificationListContainer,
logger: ShadeViewDifferLogger,
private val viewBarn: NotifViewBarn,
private val notificationIconAreaController: NotificationIconAreaController
) {
private val rootController = RootNodeController(listContainer)
// We pass a shim view here because the listContainer may not actually have a view associated
// with it and the differ never actually cares about the root node's view.
private val rootController = RootNodeController(listContainer, View(context))
private val viewDiffer = ShadeViewDiffer(rootController, logger)
fun attach(listBuilder: ShadeListBuilder) {
@@ -82,11 +87,17 @@ class ShadeViewManager constructor(
}
class ShadeViewManagerFactory @Inject constructor(
private val context: Context,
private val logger: ShadeViewDifferLogger,
private val viewBarn: NotifViewBarn,
private val notificationIconAreaController: NotificationIconAreaController
) {
fun create(listContainer: NotificationListContainer): ShadeViewManager {
return ShadeViewManager(listContainer, logger, viewBarn, notificationIconAreaController)
return ShadeViewManager(
context,
listContainer,
logger,
viewBarn,
notificationIconAreaController)
}
}