Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2671bd0d authored by Steve Elliott's avatar Steve Elliott
Browse files

Update NotifIconAreaCtrlr if NICRefactor is off 

Flag: ACONFIG com.android.systemui.notifications_icon_container_refactor STAGING
Bug: 318858608
Test: manual
  1. force disable icon container refactor (in code)
  2. verify shelf has icons
Change-Id: I68fea0f6fb1b7e8763b5d59e7ed89b766a0f3401
parent e8c4c3b0

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)

            }

        }

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

+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)))

    }