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

Merge "Same controller added twice as node spec"

Browse Source
This commit is contained in:
Jay Aliomer
2021-11-15 23:53:19 +00:00
committed by Android (Google) Code Review
parent c93f03f974 be13dbf9ff
commit 47c3baab82
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt
View File

@@ -51,8 +51,10 @@ class NodeSpecBuilder(
// If this notif begins a new section, first add the section's header view
if (section != currentSection) {
section.headerController?.let { headerController ->
root.children.add(NodeSpecImpl(root, headerController))
if (section.headerController != currentSection?.headerController) {
section.headerController?.let { headerController ->
root.children.add(NodeSpecImpl(root, headerController))
}
}
prevSections.add(currentSection)
currentSection = section

32
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt
View File

@@ -58,6 +58,7 @@ class NodeSpecBuilderTest : SysuiTestCase() {
private val section1 = buildSection(1, section1Bucket, headerController1)
private val section1NoHeader = buildSection(1, section1Bucket, null)
private val section2 = buildSection(2, section2Bucket, headerController2)
private val section3 = buildSection(3, section2Bucket, headerController2)
private val fakeViewBarn = FakeViewBarn()
@@ -74,6 +75,37 @@ class NodeSpecBuilderTest : SysuiTestCase() {
specBuilder = NodeSpecBuilder(viewBarn)
}
@Test
fun testMultipleSectionsWithSameController() {
checkOutput(
listOf(
notif(0, section0),
notif(1, section2),
notif(2, section3)
),
tree(
node(headerController0),
notifNode(0),
node(headerController2),
notifNode(1),
notifNode(2)
)
)
}
@Test(expected = RuntimeException::class)
fun testMultipleSectionsWithSameControllerNonConsecutive() {
checkOutput(
listOf(
notif(0, section0),
notif(1, section1),
notif(2, section3),
notif(3, section1)
),
tree()
)
}
@Test
fun testSimpleMapping() {
checkOutput(