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

Commit 0103b68f authored by lyn's avatar lyn
Browse files

Hide bundle in shelf for lockscreen minimalism 

Since bundles are silent,
and lockscreen minimalism puts silent notifs in shelf

Bug: 395698521
Test: LockScreenMinimalismCoordinatorTest
Flag: com.android.systemui.notification_bundle_ui
Change-Id: I1af34282faeeedfef9331ecf06f4a37c3d4b3fc9
parent 03773fb7

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

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.plugins.statusbar.statusBarStateController

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.notification.collection.BundleEntry

import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder

import com.android.systemui.statusbar.notification.collection.NotifPipeline

import com.android.systemui.statusbar.notification.collection.NotificationEntry
@@ -280,6 +281,8 @@ class LockScreenMinimalismCoordinatorTest : SysuiTestCase() { 
        val group = GroupEntryBuilder().setSummary(parent).addChild(child1).addChild(child2).build()

        val listEntryList = listOf(group, solo1, solo2)

        val notificationEntryList = listOf(solo1, solo2, parent, child1, child2)

        val bundle = BundleEntry("bundleKey")

        val bundleList = listOf(bundle)



        runCoordinatorTest {

            // All entries are added (and now unseen)
@@ -300,6 +303,11 @@ class LockScreenMinimalismCoordinatorTest : SysuiTestCase() { 
            assertThatTopOngoingKey().isEqualTo(null)

            assertThatTopUnseenKey().isEqualTo(solo1.key)



            // TEST: bundle is not picked

            onBeforeTransformGroupsListener.onBeforeTransformGroups(bundleList)

            assertThatTopOngoingKey().isEqualTo(null)

            assertThatTopUnseenKey().isEqualTo(null)



            // TEST: if top-ranked unseen is colorized, fall back to #2 ranked unseen

            solo1.setColorizedFgs(true)

            onBeforeTransformGroupsListener.onBeforeTransformGroups(listEntryList)

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.dump.DumpManager 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.collection.BundleEntry

import com.android.systemui.statusbar.notification.collection.GroupEntry

import com.android.systemui.statusbar.notification.collection.PipelineEntry

import com.android.systemui.statusbar.notification.collection.NotifPipeline
@@ -193,6 +194,7 @@ constructor( 
                    when (it) {

                        is NotificationEntry -> listOfNotNull(it)

                        is GroupEntry -> it.children

                        is BundleEntry -> emptyList()

                        else -> error("unhandled type of $it")

                    }

                }