Merge "Update NotifIconAreaCtrlr if NICRefactor is off" into main (adcc9c5d) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,8 @@ internal constructor(
		controller.setNotifStats(notifStats)
		if (NotificationIconContainerRefactor.isEnabled \|\| FooterViewRefactor.isEnabled) {
		renderListInteractor.setRenderedList(entries)
		} else {
		}
		if (!NotificationIconContainerRefactor.isEnabled) {
		notificationIconAreaController.updateNotificationIcons(entries)
		}
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ class StackCoordinatorTest : SysuiTestCase() {
		}

		@Test
		@DisableFlags(NotificationIconContainerRefactor.FLAG_NAME, FooterViewRefactor.FLAG_NAME)
		@DisableFlags(NotificationIconContainerRefactor.FLAG_NAME)
		fun testUpdateNotificationIcons() {
		afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
		verify(notificationIconAreaController).updateNotificationIcons(eq(listOf(entry)))
		@@ -89,7 +89,14 @@ class StackCoordinatorTest : SysuiTestCase() {

		@Test
		@EnableFlags(NotificationIconContainerRefactor.FLAG_NAME)
		fun testSetRenderedListOnInteractor() {
		fun testSetRenderedListOnInteractor_iconContainerFlagOn() {
		afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
		verify(renderListInteractor).setRenderedList(eq(listOf(entry)))
		}

		@Test
		@EnableFlags(FooterViewRefactor.FLAG_NAME)
		fun testSetRenderedListOnInteractor_footerFlagOn() {
		afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
		verify(renderListInteractor).setRenderedList(eq(listOf(entry)))
		}