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

Commit a13681b2 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Revert "Initial data pipeline for Smartspace media recommendations data... 

Merge "Revert "Initial data pipeline for Smartspace media recommendations data in media carousel."" into sc-dev am: b1f4cb5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14100517

Change-Id: I1725bf87be51f5a72d88afaed15ac33f543d3680
parents edbef140 b1f4cb5b

packages/SystemUI/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ android_library { 
        "res",

    ],

    static_libs: [

        "bcsmartspace",

        "WindowManager-Shell",

        "SystemUIPluginLib",

        "SystemUISharedLib",

packages/SystemUI/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -275,9 +275,6 @@ 
    <!-- Permission to make accessibility service access Bubbles -->

    <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" />



    <!-- Permission for Smartspace. -->

    <uses-permission android:name="android.permission.MANAGE_SMARTSPACE"/>





    <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />

packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

+0 −14
Original line number Diff line number Diff line 
package com.android.systemui.media



import android.animation.ArgbEvaluator

import android.app.smartspace.SmartspaceTarget

import android.content.Context

import android.content.Intent

import android.content.res.ColorStateList
@@ -202,18 +201,9 @@ class MediaCarouselController @Inject constructor( 
                }

            }



            override fun onSmartspaceMediaDataLoaded(key: String, data: SmartspaceTarget) {

                Log.d(TAG, "My Smartspace media update is here")

                addOrUpdateSmartspaceMediaRecommendations(key, data)

            }



            override fun onMediaDataRemoved(key: String) {

                removePlayer(key)

            }



            override fun onSmartspaceMediaDataRemoved(key: String) {

                Log.d(TAG, "My Smartspace media removal request is received")

            }

        })

        mediaFrame.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->

            // The pageIndicator is not laid out yet when we get the current state update,
@@ -301,10 +291,6 @@ class MediaCarouselController @Inject constructor( 
        }

    }



    private fun addOrUpdateSmartspaceMediaRecommendations(key: String, data: SmartspaceTarget) {

        // TODO(b/182813345): Add Smartspace media recommendation view.

    }



    private fun removePlayer(key: String, dismissMediaData: Boolean = true) {

        val removed = MediaPlayerData.removeMediaPlayer(key)

        removed?.apply {

packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt

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


package com.android.systemui.media



import android.app.smartspace.SmartspaceTarget

import javax.inject.Inject



/**
@@ -38,18 +37,10 @@ class MediaDataCombineLatest @Inject constructor() : MediaDataManager.Listener, 
        }

    }



    override fun onSmartspaceMediaDataLoaded(key: String, data: SmartspaceTarget) {

        listeners.toSet().forEach { it.onSmartspaceMediaDataLoaded(key, data) }

    }



    override fun onMediaDataRemoved(key: String) {

        remove(key)

    }



    override fun onSmartspaceMediaDataRemoved(key: String) {

        listeners.toSet().forEach { it.onSmartspaceMediaDataRemoved(key) }

    }



    override fun onMediaDeviceChanged(

        key: String,

        oldKey: String?,

packages/SystemUI/src/com/android/systemui/media/MediaDataFilter.kt

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


package com.android.systemui.media



import android.app.smartspace.SmartspaceTarget

import android.util.Log

import com.android.internal.annotations.VisibleForTesting

import com.android.systemui.broadcast.BroadcastDispatcher
@@ -83,10 +82,6 @@ class MediaDataFilter @Inject constructor( 
        }

    }



    override fun onSmartspaceMediaDataLoaded(key: String, data: SmartspaceTarget) {

        listeners.forEach { it.onSmartspaceMediaDataLoaded(key, data) }

    }



    override fun onMediaDataRemoved(key: String) {

        allEntries.remove(key)

        userEntries.remove(key)?.let {
@@ -97,10 +92,6 @@ class MediaDataFilter @Inject constructor( 
        }

    }



    override fun onSmartspaceMediaDataRemoved(key: String) {

        listeners.forEach { it.onSmartspaceMediaDataRemoved(key) }

    }



    @VisibleForTesting

    internal fun handleUserSwitched(id: Int) {

        // If the user changes, remove all current MediaData objects and inform listeners