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

Commit 9e517f73 authored by Selim Cinek's avatar Selim Cinek
Browse files

Factored out the media view manager from the hiearchyManager 

It was always supposed to be separate, but we now finally
split it in preparation for the Viewpager refactor.

Bug: 154137987
Test: add media notification, observe :)
Change-Id: I1ae53ab1cb9bb67493fa4175e06687cb2b3b4b78
parent 098baf4d

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

+9 −115
Original line number Diff line number Diff line
@@ -21,30 +21,20 @@ import android.animation.AnimatorListenerAdapter 
import android.animation.ValueAnimator

import android.annotation.IntDef

import android.content.Context

import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroupOverlay

import android.widget.LinearLayout



import com.android.settingslib.bluetooth.LocalBluetoothManager

import com.android.settingslib.media.InfoMediaManager

import com.android.settingslib.media.LocalMediaManager

import com.android.systemui.Interpolators

import com.android.systemui.R

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.notification.VisualStabilityManager

import com.android.systemui.statusbar.notification.stack.StackStateAnimator

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.animation.UniqueObjectHost

import com.android.systemui.util.concurrency.DelayableExecutor

import java.util.concurrent.Executor

import javax.inject.Inject

import javax.inject.Singleton
@@ -55,18 +45,15 @@ import javax.inject.Singleton 
@Singleton

class MediaHierarchyManager @Inject constructor(

    private val context: Context,

    @Main private val foregroundExecutor: Executor,

    @Background private val backgroundExecutor: DelayableExecutor,

    private val localBluetoothManager: LocalBluetoothManager?,

    private val visualStabilityManager: VisualStabilityManager,

    private val statusBarStateController: SysuiStatusBarStateController,

    private val keyguardStateController: KeyguardStateController,

    private val bypassController: KeyguardBypassController,

    private val activityStarter: ActivityStarter,

    mediaManager: MediaDataManager

    private val mediaViewManager: MediaViewManager

) {

    private var rootOverlay: ViewGroupOverlay? = null

    private lateinit var currentState: MediaState

    private val mediaCarousel

        get() =  mediaViewManager.mediaCarousel

    private var animationStartState: MediaState? = null

    private var animator = ValueAnimator.ofFloat(0.0f, 1.0f).apply {

        interpolator = Interpolators.FAST_OUT_SLOW_IN
@@ -92,23 +79,11 @@ class MediaHierarchyManager @Inject constructor( 
        })

    }

    private var targetState: MediaState? = null

    private val mediaCarousel: ViewGroup

    private val mediaContent: ViewGroup

    private val mediaPlayers: MutableMap<String, MediaControlPanel> = mutableMapOf()

    private val mediaHosts = arrayOfNulls<MediaHost>(LOCATION_LOCKSCREEN + 1)

    private val visualStabilityCallback = ::reorderAllPlayers

    private var previousLocation = -1

    private var desiredLocation = -1

    private var currentAttachmentLocation = -1



    var shouldListen = true

        set(value) {

            field = value

            for (player in mediaPlayers.values) {

                player.setListening(shouldListen)

            }

        }



    var qsExpansion: Float = 0.0f

        set(value) {

            if (field != value) {
@@ -122,21 +97,6 @@ class MediaHierarchyManager @Inject constructor( 
        }



    init {

        mediaCarousel = inflateMediaCarousel()

        mediaContent = mediaCarousel.requireViewById(R.id.media_carousel)

        mediaManager.addListener(object : MediaDataManager.Listener {

            override fun onMediaDataLoaded(key: String, data: MediaData) {

                updateView(key, data)

            }



            override fun onMediaDataRemoved(key: String) {

                val removed = mediaPlayers.remove(key)

                removed?.apply {

                    mediaContent.removeView(removed.view)

                    removed.onDestroy()

                }

            }

        })

        statusBarStateController.addCallback(object : StatusBarStateController.StateListener {

            override fun onStateChanged(newState: Int) {

                updateDesiredLocation()
@@ -144,72 +104,6 @@ class MediaHierarchyManager @Inject constructor( 
        })

    }



    private fun inflateMediaCarousel(): ViewGroup {

        return LayoutInflater.from(context).inflate(

                R.layout.media_carousel, UniqueObjectHost(context), false) as ViewGroup

    }



    private fun reorderAllPlayers() {

        for (mediaPlayer in mediaPlayers.values) {

            val view = mediaPlayer.view

            if (mediaPlayer.isPlaying && mediaContent.indexOfChild(view) != 0) {

                mediaContent.removeView(view)

                mediaContent.addView(view, 0)

            }

        }

        updateMediaPaddings()

    }



    private fun updateView(key: String, data: MediaData) {

        var existingPlayer = mediaPlayers[key]

        if (existingPlayer == null) {

            // Set up listener for device changes

            // TODO: integrate with MediaTransferManager?

            val imm = InfoMediaManager(context, data.packageName,

                    null /* notification */, localBluetoothManager)

            val routeManager = LocalMediaManager(context, localBluetoothManager,

                    imm, data.packageName)



            existingPlayer = MediaControlPanel(context, mediaContent, routeManager,

                    foregroundExecutor, backgroundExecutor, activityStarter)

            mediaPlayers[key] = existingPlayer

            val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

                    ViewGroup.LayoutParams.WRAP_CONTENT)

            existingPlayer.view.setLayoutParams(lp)

            existingPlayer.setListening(shouldListen)

            if (existingPlayer.isPlaying) {

                mediaContent.addView(existingPlayer.view, 0)

            } else {

                mediaContent.addView(existingPlayer.view)

            }

        } else if (existingPlayer.isPlaying &&

                mediaContent.indexOfChild(existingPlayer.view) != 0) {

            if (visualStabilityManager.isReorderingAllowed) {

                mediaContent.removeView(existingPlayer.view)

                mediaContent.addView(existingPlayer.view, 0)

            } else {

                visualStabilityManager.addReorderingAllowedCallback(visualStabilityCallback)

            }

        }

        existingPlayer.bind(data)

        updateMediaPaddings()

    }



    private fun updateMediaPaddings() {

        val padding = context.resources.getDimensionPixelSize(R.dimen.qs_media_padding)

        val childCount = mediaContent.childCount

        for (i in 0 until childCount) {

            val mediaView = mediaContent.getChildAt(i)

            val desiredPaddingEnd = if (i == childCount - 1) 0 else padding

            val layoutParams = mediaView.layoutParams as ViewGroup.MarginLayoutParams

            if (layoutParams.marginEnd != desiredPaddingEnd) {

                layoutParams.marginEnd = desiredPaddingEnd

                mediaView.layoutParams = layoutParams

            }

        }



    }



    /**

     * Register a media host and create a view can be attached to a view hierarchy

     * and where the players will be placed in when the host is the currently desired state.
@@ -386,16 +280,16 @@ class MediaHierarchyManager @Inject constructor( 


    private fun applyState(state: MediaState) {

        updateHostAttachment()

        for (mediaPlayer in mediaPlayers.values) {

            val view = mediaPlayer.view

            view.progress = state.expansion

        }

        val boundsOnScreen = state.boundsOnScreen

        if (currentAttachmentLocation == IN_OVERLAY) {

            mediaCarousel.setLeftTopRightBottom(boundsOnScreen.left, boundsOnScreen.top,

                    boundsOnScreen.right, boundsOnScreen.bottom)

            mediaCarousel.setLeftTopRightBottom(

                    boundsOnScreen.left,

                    boundsOnScreen.top,

                    boundsOnScreen.right,

                    boundsOnScreen.bottom)

        }

        currentState = state.copy()

        mediaViewManager.applyState(currentState)

    }



    private fun updateHostAttachment() {

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

+0 −5
Original line number Diff line number Diff line
@@ -75,11 +75,6 @@ class MediaHost @Inject constructor( 
        updateViewVisibility()

    }



    fun setShouldListen(listen: Boolean) {

        // TODO: look into listening more

        mediaHierarchyManager.shouldListen = listen

    }



    private fun updateViewVisibility() {

        if (showsOnlyActiveMedia) {

            visible = mediaDataManager.hasActiveMedia()

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

0 → 100644
+143 −0
Original line number Diff line number Diff line 
package com.android.systemui.media



import android.content.Context

import android.view.LayoutInflater

import android.view.ViewGroup

import android.widget.LinearLayout



import com.android.settingslib.bluetooth.LocalBluetoothManager

import com.android.settingslib.media.InfoMediaManager

import com.android.settingslib.media.LocalMediaManager

import com.android.systemui.R

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.statusbar.notification.VisualStabilityManager

import com.android.systemui.util.animation.UniqueObjectHost

import com.android.systemui.util.concurrency.DelayableExecutor

import java.util.concurrent.Executor

import javax.inject.Inject

import javax.inject.Singleton



/**

 * Class that is responsible for keeping the view carousel up to date.

 * This also handles changes in state and applies them to the media carousel like the expansion.

 */

@Singleton

class MediaViewManager @Inject constructor(

    private val context: Context,

    @Main private val foregroundExecutor: Executor,

    @Background private val backgroundExecutor: DelayableExecutor,

    private val localBluetoothManager: LocalBluetoothManager?,

    private val visualStabilityManager: VisualStabilityManager,

    private val activityStarter: ActivityStarter,

    mediaManager: MediaDataManager

) {

    private var targetState: MediaState? = null

    val mediaCarousel: ViewGroup

    private val mediaContent: ViewGroup

    private val mediaPlayers: MutableMap<String, MediaControlPanel> = mutableMapOf()

    private val visualStabilityCallback = ::reorderAllPlayers



    private var viewsExpanded = true

        set(value) {

            if (field != value) {

                field = value

                for (player in mediaPlayers.values) {

                    player.setListening(field)

                }

            }

        }



    init {

        mediaCarousel = inflateMediaCarousel()

        mediaContent = mediaCarousel.requireViewById(R.id.media_carousel)

        mediaManager.addListener(object : MediaDataManager.Listener {

            override fun onMediaDataLoaded(key: String, data: MediaData) {

                updateView(key, data)

            }



            override fun onMediaDataRemoved(key: String) {

                val removed = mediaPlayers.remove(key)

                removed?.apply {

                    mediaContent.removeView(removed.view)

                    removed.onDestroy()

                }

            }

        })

    }



    private fun inflateMediaCarousel(): ViewGroup {

        return LayoutInflater.from(context).inflate(

                R.layout.media_carousel, UniqueObjectHost(context), false) as ViewGroup

    }



    private fun reorderAllPlayers() {

        for (mediaPlayer in mediaPlayers.values) {

            val view = mediaPlayer.view

            if (mediaPlayer.isPlaying && mediaContent.indexOfChild(view) != 0) {

                mediaContent.removeView(view)

                mediaContent.addView(view, 0)

            }

        }

        updateMediaPaddings()

    }



    private fun updateView(key: String, data: MediaData) {

        var existingPlayer = mediaPlayers[key]

        if (existingPlayer == null) {

            // Set up listener for device changes

            // TODO: integrate with MediaTransferManager?

            val imm = InfoMediaManager(context, data.packageName,

                    null /* notification */, localBluetoothManager)

            val routeManager = LocalMediaManager(context, localBluetoothManager,

                    imm, data.packageName)



            existingPlayer = MediaControlPanel(context, mediaContent, routeManager,

                    foregroundExecutor, backgroundExecutor, activityStarter)

            mediaPlayers[key] = existingPlayer

            val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

                    ViewGroup.LayoutParams.WRAP_CONTENT)

            existingPlayer.view.setLayoutParams(lp)

            existingPlayer.setListening(viewsExpanded)

            if (existingPlayer.isPlaying) {

                mediaContent.addView(existingPlayer.view, 0)

            } else {

                mediaContent.addView(existingPlayer.view)

            }

        } else if (existingPlayer.isPlaying &&

                mediaContent.indexOfChild(existingPlayer.view) != 0) {

            if (visualStabilityManager.isReorderingAllowed) {

                mediaContent.removeView(existingPlayer.view)

                mediaContent.addView(existingPlayer.view, 0)

            } else {

                visualStabilityManager.addReorderingAllowedCallback(visualStabilityCallback)

            }

        }

        existingPlayer.bind(data)

        updateMediaPaddings()

    }



    private fun updateMediaPaddings() {

        val padding = context.resources.getDimensionPixelSize(R.dimen.qs_media_padding)

        val childCount = mediaContent.childCount

        for (i in 0 until childCount) {

            val mediaView = mediaContent.getChildAt(i)

            val desiredPaddingEnd = if (i == childCount - 1) 0 else padding

            val layoutParams = mediaView.layoutParams as ViewGroup.MarginLayoutParams

            if (layoutParams.marginEnd != desiredPaddingEnd) {

                layoutParams.marginEnd = desiredPaddingEnd

                mediaView.layoutParams = layoutParams

            }

        }



    }



    fun applyState(state: MediaState) {

        for (mediaPlayer in mediaPlayers.values) {

            val view = mediaPlayer.view

            view.progress = state.expansion

        }

        viewsExpanded = state.expansion > 0;

    }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+0 −1
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne 


    public void setListening(boolean listening) {

        if (mListening == listening) return;

        mMediaHost.setShouldListen(listening);

        if (mTileLayout != null) {

            mQSLogger.logAllTilesChangeListening(listening, getDumpableTag(), mCachedSpecs);

            mTileLayout.setListening(listening);