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

Commit c5e9269d authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Fix media output click component behaviour:" into main

parents 9561c544 3c07c9a1

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModelTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.systemui.volume.mediaControllerRepository 
import com.android.systemui.volume.mediaDeviceSessionInteractor

import com.android.systemui.volume.mediaOutputActionsInteractor

import com.android.systemui.volume.mediaOutputInteractor

import com.android.systemui.volume.panel.volumePanelViewModel

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent
@@ -62,7 +61,6 @@ class MediaOutputViewModelTest : SysuiTestCase() { 
                MediaOutputViewModel(

                    applicationContext,

                    testScope.backgroundScope,

                    volumePanelViewModel,

                    mediaOutputActionsInteractor,

                    mediaDeviceSessionInteractor,

                    mediaOutputInteractor,

packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import com.android.settingslib.volume.data.repository.MediaControllerChange 
import com.android.settingslib.volume.data.repository.MediaControllerRepository

import com.android.settingslib.volume.data.repository.stateChanges

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

import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession

import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession

import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope

import javax.inject.Inject

import kotlin.coroutines.CoroutineContext

packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputActionsInteractor.kt

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import com.android.systemui.animation.DialogCuj 
import com.android.systemui.animation.DialogTransitionAnimator

import com.android.systemui.animation.Expandable

import com.android.systemui.media.dialog.MediaOutputDialogManager

import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession

import com.android.systemui.volume.panel.component.mediaoutput.shared.model.SessionWithPlayback

import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope

import javax.inject.Inject
@@ -33,10 +33,10 @@ constructor( 
    private val mediaOutputDialogManager: MediaOutputDialogManager,

) {



    fun onBarClick(session: MediaDeviceSession, isPlaybackActive: Boolean, expandable: Expandable) {

        if (isPlaybackActive) {

    fun onBarClick(sessionWithPlayback: SessionWithPlayback?, expandable: Expandable) {

        if (sessionWithPlayback?.playback?.isActive == true) {

            mediaOutputDialogManager.createAndShowWithController(

                session.packageName,

                sessionWithPlayback.session.packageName,

                false,

                expandable.dialogController()

            )

packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import com.android.settingslib.volume.data.repository.LocalMediaRepository 
import com.android.settingslib.volume.data.repository.MediaControllerRepository

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

import com.android.systemui.volume.panel.component.mediaoutput.data.repository.LocalMediaRepositoryFactory

import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession

import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSessions

import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession

import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope

import javax.inject.Inject

import kotlin.coroutines.CoroutineContext

packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSessions.kt

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


package com.android.systemui.volume.panel.component.mediaoutput.domain.model



import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession



/** Models a pair of local and remote [MediaDeviceSession]s. */

data class MediaDeviceSessions(

    val local: MediaDeviceSession?,