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

Commit 6c22fd53 authored by Kai Li's avatar Kai Li
Browse files

Don't filter for smartspace FEATURE_TYPE. 

The smartspaceTargetId is enough for our requirement.

Bug: 403422950
Change-Id: Iff5679d6bad71c2bbb32651383bcb9ab82b84f5a
Flag: com.android.systemui.enable_underlay
Test: atest AmbientCueRepositoryTest
parent 78552f3d

packages/SystemUI/multivalentTests/src/com/android/systemui/ambientcue/data/repository/AmbientCueRepositoryTest.kt

+2 −13
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.testableContext 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.ambientcue.data.repository.AmbientCueRepositoryImpl.Companion.AMBIENT_ACTION_FEATURE

import com.android.systemui.ambientcue.data.repository.AmbientCueRepositoryImpl.Companion.AMBIENT_CUE_SURFACE

import com.android.systemui.concurrency.fakeExecutor

import com.android.systemui.kosmos.advanceUntilIdle
@@ -83,7 +82,7 @@ class AmbientCueRepositoryTest : SysuiTestCase() { 
            verify(smartSpaceSession)

                .addOnTargetsAvailableListener(any(), onTargetsAvailableListenerCaptor.capture())

            onTargetsAvailableListenerCaptor.firstValue.onTargetsAvailable(

                listOf(invalidTarget1, invalidTarget2)

                listOf(invalidTarget1)

            )

            advanceUntilIdle()

            assertThat(isVisible).isFalse()
@@ -121,7 +120,6 @@ class AmbientCueRepositoryTest : SysuiTestCase() { 
        private const val SUBTITLE_2 = "subtitle 2"

        private val validTarget =

            mock<SmartspaceTarget> {

                on { featureType } doReturn AMBIENT_ACTION_FEATURE

                on { smartspaceTargetId } doReturn AMBIENT_CUE_SURFACE

                on { actionChips } doReturn

                    listOf(
@@ -136,20 +134,11 @@ class AmbientCueRepositoryTest : SysuiTestCase() { 


        private val invalidTarget1 =

            mock<SmartspaceTarget> {

                on { featureType } doReturn 1

                on { smartspaceTargetId } doReturn AMBIENT_CUE_SURFACE

                on { actionChips } doReturn

                    listOf(SmartspaceAction.Builder("id", "title").setSubtitle("subtitle").build())

            }



        private val invalidTarget2 =

            mock<SmartspaceTarget> {

                on { featureType } doReturn AMBIENT_ACTION_FEATURE

                on { smartspaceTargetId } doReturn "home"

                on { actionChips } doReturn

                    listOf(SmartspaceAction.Builder("id", "title").setSubtitle("subtitle").build())

            }



        private val allTargets = listOf(validTarget, invalidTarget1, invalidTarget2)

        private val allTargets = listOf(validTarget, invalidTarget1)

    }

}

packages/SystemUI/src/com/android/systemui/ambientcue/data/repository/AmbientCueRepository.kt

+0 −3
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ constructor( 
                val smartSpaceListener = OnTargetsAvailableListener { targets ->

                    val actions =

                        targets

                            .filter { target -> target.featureType == AMBIENT_ACTION_FEATURE }

                            .filter { it.smartspaceTargetId == AMBIENT_CUE_SURFACE }

                            .flatMap { target -> target.actionChips }

                            .map { chip ->
@@ -111,8 +110,6 @@ constructor( 
    override val isVisible: MutableStateFlow<Boolean> = MutableStateFlow(false)



    companion object {

        // Privately defined card type, exclusive for ambient actions

        @VisibleForTesting const val AMBIENT_ACTION_FEATURE = 72

        // Surface that PCC wants to push cards into

        @VisibleForTesting const val AMBIENT_CUE_SURFACE = "ambientcue"

        // Timeout to hide cuebar if it wasn't interacted with