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

Commit afba13fe authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes Ibef01f51,Ic3218a76,I5c3cb781 into main 

* changes:
  Change minimalism prototype to mark notifications seen only when the shade has been expanded.
  Split the minimalism prototype into an alternate coordinator
  Simplify the minimalism flag wrapper to a single version.
parents e0754ed4 bb55f68a

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+6 −4
Original line number Diff line number Diff line
@@ -175,12 +175,14 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            transitionStateFlow.value = ObservableTransitionState.Idle(Scenes.Gone)

            assertThat(isVisible).isFalse()



            kosmos.headsUpNotificationRepository.activeHeadsUpRows.value =

            kosmos.headsUpNotificationRepository.setNotifications(

                buildNotificationRows(isPinned = true)

            )

            assertThat(isVisible).isTrue()



            kosmos.headsUpNotificationRepository.activeHeadsUpRows.value =

            kosmos.headsUpNotificationRepository.setNotifications(

                buildNotificationRows(isPinned = false)

            )

            assertThat(isVisible).isFalse()

        }
@@ -1699,8 +1701,8 @@ class SceneContainerStartableTest : SysuiTestCase() { 
        return transitionStateFlow

    }



    private fun buildNotificationRows(isPinned: Boolean = false): Set<HeadsUpRowRepository> =

        setOf(

    private fun buildNotificationRows(isPinned: Boolean = false): List<HeadsUpRowRepository> =

        listOf(

            fakeHeadsUpRowRepository(key = "0", isPinned = isPinned),

            fakeHeadsUpRowRepository(key = "1", isPinned = isPinned),

            fakeHeadsUpRowRepository(key = "2", isPinned = isPinned),

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

0 → 100644
+510 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.systemui.statusbar.notification.data.repository.FakeHeadsUpRo 
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.data.repository.setNotifications

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

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

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

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.systemui.statusbar.notification.data.repository.setActiveNoti 
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.notification.stack.data.repository.setNotifications

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

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

import com.android.systemui.statusbar.policy.fakeConfigurationController

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefac 
import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor

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

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

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

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

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

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

import javax.inject.Inject
@@ -55,6 +57,7 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        FooterViewRefactor.token dependsOn NotificationIconContainerRefactor.token

        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        PriorityPeopleSection.token dependsOn SortBySectionTimeFlag.token

        NotificationMinimalismPrototype.token dependsOn NotificationsHeadsUpRefactor.token



        // SceneContainer dependencies

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