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

Commit afeb89cc authored by András Kurucz's avatar András Kurucz
Browse files

[Flexiglass] Fold NotificationsHeadsUpRefactor flag into SceneContainerFlag 

Convert all usages of the NotificationsHeadsUpRefactor flag into
SceneContainerFlag, because we want to roll them out together.
Make SceneContainerFlag depend on NotificationThrottleHun, because we
have just inherited this dependency from NotificationsHeadsUpRefactor.

Bug: 325936094
Test: manually verified that HUNs are displayed in Flexiglass
Flag: com.android.systemui.scene_container
Change-Id: I4fc0aaa6f0d68837e5d8003d78177887980d7889
parent e3475620

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -138,13 +138,6 @@ flag { 
    bug: "308623704"

}



flag {

    name: "notifications_heads_up_refactor"

    namespace: "systemui"

    description: "Use HeadsUpInteractor to feed HUN updates to the NSSL."

    bug: "325936094"

}



flag {

   name: "notification_transparent_header_fix"

   namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 


package com.android.systemui.statusbar.notification.domain.interactor



import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
@@ -31,7 +31,6 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.statusbar.notification.data.repository.FakeHeadsUpRowRepository

import com.android.systemui.statusbar.notification.data.repository.notificationsKeyguardViewStateRepository

import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor

import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository

import com.android.systemui.statusbar.notification.stack.domain.interactor.headsUpNotificationInteractor

import com.android.systemui.testKosmos
@@ -44,7 +43,7 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

@EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

@EnableSceneContainer

class HeadsUpNotificationInteractorTest : SysuiTestCase() {

    private val kosmos =

        testKosmos().apply {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.test.filters.SmallTest 
import com.android.settingslib.notification.data.repository.updateNotificationPolicy

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.flags.fakeFeatureFlagsClassic
@@ -41,7 +42,6 @@ import com.android.systemui.statusbar.notification.data.repository.FakeHeadsUpRo 
import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.setActiveNotifs

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor

import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor

import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository

import com.android.systemui.statusbar.policy.data.repository.fakeUserSetupRepository

import com.android.systemui.statusbar.policy.data.repository.zenModeRepository
@@ -535,7 +535,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun pinnedHeadsUpRows_filtersForPinnedItems() =

        testScope.runTest {

            val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows)
@@ -576,7 +576,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun hasPinnedHeadsUpRows_true() =

        testScope.runTest {

            val hasPinnedHeadsUpRow by collectLastValue(underTest.hasPinnedHeadsUpRow)
@@ -591,7 +591,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun hasPinnedHeadsUpRows_false() =

        testScope.runTest {

            val hasPinnedHeadsUpRow by collectLastValue(underTest.hasPinnedHeadsUpRow)
@@ -606,7 +606,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun topHeadsUpRow_emptyList_null() =

        testScope.runTest {

            val topHeadsUpRow by collectLastValue(underTest.topHeadsUpRow)
@@ -618,7 +618,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun headsUpAnimationsEnabled_true() =

        testScope.runTest {

            val animationsEnabled by collectLastValue(underTest.headsUpAnimationsEnabled)
@@ -631,7 +631,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
        }



    @Test

    @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME)

    @EnableSceneContainer

    fun headsUpAnimationsEnabled_keyguardShowing_true() =

        testScope.runTest {

            val animationsEnabled by collectLastValue(underTest.headsUpAnimationsEnabled)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.testing.TestableLooper.RunWithLooper 
import androidx.test.filters.SmallTest

import com.android.internal.logging.UiEventLogger

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.kosmos.testScope

import com.android.systemui.log.logcatLogBuffer

import com.android.systemui.plugins.statusbar.StatusBarStateController
@@ -36,7 +37,6 @@ import com.android.systemui.statusbar.notification.collection.provider.VisualSta 
import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone

import com.android.systemui.statusbar.phone.KeyguardBypassController
@@ -469,9 +469,9 @@ class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : BaseHeadsUpManager 
        @get:Parameters(name = "{0}")

        val flags: List<FlagsParameterization>

            get() = buildList {

                addAll(FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME))

                addAll(

                    FlagsParameterization.allCombinationsOf(NotificationsHeadsUpRefactor.FLAG_NAME)

                    FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME)

                        .andSceneContainer()

                )

            }

    }

packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.statusbar.notification.interruption.VisualInterrupti 
import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor

import com.android.systemui.statusbar.notification.shared.PriorityPeopleSection

import javax.inject.Inject
@@ -59,7 +58,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        PriorityPeopleSection.token dependsOn SortBySectionTimeFlag.token

        NotificationMinimalismPrototype.token dependsOn NotificationThrottleHun.token

        NotificationsHeadsUpRefactor.token dependsOn NotificationThrottleHun.token



        // SceneContainer dependencies

        SceneContainerFlag.getFlagDependencies().forEach { (alpha, beta) -> alpha dependsOn beta }