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

Commit 79e14a7a authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Implement remaining bubble suppression logic 

Bug: 261728888
Test: atest NotificationInterruptStateProviderWrapperTest
Test: atest VisualInterruptionDecisionProviderImplTest
Flag: ACONFIG com.android.systemui.visual_interruptions_refactor DEVELOPMENT
Change-Id: I316150ef1a75fc6effc891abda850b1b2f9390e1
parent 974bbf59

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.notification.interruption



import android.app.Notification.BubbleMetadata

import android.app.Notification.VISIBILITY_PRIVATE

import android.app.NotificationManager.IMPORTANCE_DEFAULT

import android.app.NotificationManager.IMPORTANCE_HIGH
@@ -31,6 +32,7 @@ import com.android.systemui.settings.UserTracker 
import com.android.systemui.statusbar.StatusBarState.SHADE

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

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl.MAX_HUN_WHEN_AGE_MS

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.BUBBLE

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.PEEK

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.PULSE

import com.android.systemui.statusbar.policy.BatteryController
@@ -180,3 +182,17 @@ class PulseLowImportanceSuppressor() : 
    VisualInterruptionFilter(types = setOf(PULSE), reason = "importance less than DEFAULT") {

    override fun shouldSuppress(entry: NotificationEntry) = entry.importance < IMPORTANCE_DEFAULT

}



class BubbleNotAllowedSuppressor() :

    VisualInterruptionFilter(types = setOf(BUBBLE), reason = "not allowed") {

    override fun shouldSuppress(entry: NotificationEntry) = !entry.canBubble()

}



class BubbleNoMetadataSuppressor() :

    VisualInterruptionFilter(types = setOf(BUBBLE), reason = "no bubble metadata") {



    private fun isValidMetadata(metadata: BubbleMetadata?) =

        metadata != null && (metadata.intent != null || metadata.shortcutId != null)



    override fun shouldSuppress(entry: NotificationEntry) = !isValidMetadata(entry.bubbleMetadata)

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ constructor( 
        addFilter(PulseEffectSuppressor())

        addFilter(PulseLockscreenVisibilityPrivateSuppressor())

        addFilter(PulseLowImportanceSuppressor())

        addFilter(BubbleNotAllowedSuppressor())

        addFilter(BubbleNoMetadataSuppressor())



        started = true

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt

+43 −16
Original line number Diff line number Diff line
@@ -306,9 +306,27 @@ abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() { 
    }



    @Test

    fun testShouldBubble() {

    fun testShouldBubble_withIntentAndIcon() {

        ensureBubbleState()

        assertShouldBubble(buildBubbleEntry())

        assertShouldBubble(buildBubbleEntry { bubbleIsShortcut = false })

    }



    @Test

    fun testShouldBubble_withShortcut() {

        ensureBubbleState()

        assertShouldBubble(buildBubbleEntry { bubbleIsShortcut = true })

    }



    @Test

    fun testShouldNotBubble_notAllowed() {

        ensureBubbleState()

        assertShouldNotBubble(buildBubbleEntry { canBubble = false })

    }



    @Test

    fun testShouldNotBubble_noBubbleMetadata() {

        ensureBubbleState()

        assertShouldNotBubble(buildBubbleEntry { hasBubbleMetadata = false })

    }



    @Test
@@ -487,9 +505,14 @@ abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() { 
        var canBubble: Boolean? = null

        var isBubble = false

        var hasBubbleMetadata = false

        var bubbleSuppressNotification: Boolean? = null



        private fun buildBubbleMetadata() =

        var bubbleIsShortcut = false

        var bubbleSuppressesNotification: Boolean? = null



        private fun buildBubbleMetadata(): BubbleMetadata {

            val builder =

                if (bubbleIsShortcut) {

                    BubbleMetadata.Builder(context.packageName + ":test_shortcut_id")

                } else {

                    BubbleMetadata.Builder(

                        PendingIntent.getActivity(

                            context,
@@ -499,8 +522,12 @@ abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() { 
                        ),

                        Icon.createWithResource(context.resources, R.drawable.android)

                    )

                .apply { bubbleSuppressNotification?.let { setSuppressNotification(it) } }

                .build()

                }



            bubbleSuppressesNotification?.let { builder.setSuppressNotification(it) }



            return builder.build()

        }



        fun build() =

            Notification.Builder(context, TEST_CHANNEL_ID)