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

Commit fce3775e authored by Cecilia's avatar Cecilia
Browse files

Remove the Smartspace update's media filter. 

The surface-specific logic is now covered in the upstream, so that only the media-specific updates will be passed down. Thus, the hard-coded filter is no longer needed.

Bug: 246629495
Test: Local test
Change-Id: I047b55bfd5db1a03540730b9eafa90cfcd131bdc
parent d35150f9

packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataProvider.kt

+2 −18
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ class SmartspaceMediaDataProvider @Inject constructor() : BcSmartspaceDataPlugin 


    private val smartspaceMediaTargetListeners: MutableList<SmartspaceTargetListener> =

        mutableListOf()

    private var smartspaceMediaTargets: List<SmartspaceTarget> = listOf()



    override fun registerListener(smartspaceTargetListener: SmartspaceTargetListener) {

        smartspaceMediaTargetListeners.add(smartspaceTargetListener)
@@ -41,22 +40,7 @@ class SmartspaceMediaDataProvider @Inject constructor() : BcSmartspaceDataPlugin 


    /** Updates Smartspace data and propagates it to any listeners. */

    override fun onTargetsAvailable(targets: List<SmartspaceTarget>) {

        // Filter out non-media targets.

        val mediaTargets = mutableListOf<SmartspaceTarget>()

        for (target in targets) {

            val smartspaceTarget = target

            if (smartspaceTarget.featureType == SmartspaceTarget.FEATURE_MEDIA) {

                mediaTargets.add(smartspaceTarget)

            }

        }



        if (!mediaTargets.isEmpty()) {

            Log.d(TAG, "Forwarding Smartspace media updates $mediaTargets")

        }



        smartspaceMediaTargets = mediaTargets

        smartspaceMediaTargetListeners.forEach {

            it.onSmartspaceTargetsUpdated(smartspaceMediaTargets)

        }

        Log.d(TAG, "Forwarding Smartspace updates $targets")

        smartspaceMediaTargetListeners.forEach { it.onSmartspaceTargetsUpdated(targets) }

    }

}