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

Commit 94999ee8 authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Remove parameter in onRemoved method 

Removes view-model parameter and adds position parameter of view-model
when adding new media control.

Flag: ACONFIG media_control_refactor DISABLED
Bug: 328207006
Test: atest SystemUiRoboTests:MediaDiffUtilTest
Test: Build
Change-Id: I6f9f5b592ff51054a22b85024ac283f457b8f6eb
parent 0244bdd8

packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/util/MediaDiffUtilTest.kt

+10 −10
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { commonViewModel -> assertThat(commonViewModel).isEqualTo(mediaControl) },

                { commonViewModel, _ -> assertThat(commonViewModel).isEqualTo(mediaControl) },

                { fail("Unexpected to update $it") },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -65,7 +65,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { commonViewModel -> assertThat(commonViewModel).isEqualTo(mediaRecs) },

                { commonViewModel, _ -> assertThat(commonViewModel).isEqualTo(mediaRecs) },

                { fail("Unexpected to update $it") },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -84,7 +84,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { commonViewModel -> assertThat(commonViewModel).isNotEqualTo(mediaControl) },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -103,7 +103,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { commonViewModel -> assertThat(commonViewModel).isNotEqualTo(mediaRecs) },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -123,7 +123,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { fail("Unexpected to update $it") },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> assertThat(commonViewModel).isEqualTo(mediaControl1) },
@@ -144,7 +144,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { fail("Unexpected to update $it") },

                { fail("Unexpected to remove $it") },

                { commonViewModel, _, _ -> assertThat(commonViewModel).isEqualTo(mediaRecs) },
@@ -163,7 +163,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { fail("Unexpected to update $it") },

                { commonViewModel -> assertThat(commonViewModel).isEqualTo(mediaControl) },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -182,7 +182,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            MediaViewModelListUpdateCallback(

                oldList,

                newList,

                { fail("Unexpected to add $it") },

                { commonViewModel, _ -> fail("Unexpected to add $commonViewModel") },

                { fail("Unexpected to update $it") },

                { commonViewModel -> assertThat(commonViewModel).isEqualTo(mediaRecs) },

                { commonViewModel, _, _ -> fail("Unexpected to move $commonViewModel ") },
@@ -200,7 +200,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            immediatelyUpdateUi = immediatelyUpdateUi,

            controlViewModel = kosmos.mediaControlViewModel,

            onAdded = {},

            onRemoved = { _, _ -> },

            onRemoved = {},

            onUpdated = {}

        )

    }
@@ -214,7 +214,7 @@ class MediaDiffUtilTest : SysuiTestCase() { 
            loadingEnabled = loadingEnabled,

            recsViewModel = kosmos.mediaRecommendationsViewModel,

            onAdded = {},

            onRemoved = { _, _ -> },

            onRemoved = {},

            onUpdated = {}

        )

    }

packages/SystemUI/src/com/android/systemui/media/controls/ui/util/MediaViewModelListUpdateCallback.kt

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import com.android.systemui.media.controls.ui.viewmodel.MediaCommonViewModel 
class MediaViewModelListUpdateCallback(

    private val old: List<MediaCommonViewModel>,

    private val new: List<MediaCommonViewModel>,

    private val onAdded: (MediaCommonViewModel) -> Unit,

    private val onAdded: (MediaCommonViewModel, Int) -> Unit,

    private val onUpdated: (MediaCommonViewModel) -> Unit,

    private val onRemoved: (MediaCommonViewModel) -> Unit,

    private val onMoved: (MediaCommonViewModel, Int, Int) -> Unit,
@@ -31,7 +31,7 @@ class MediaViewModelListUpdateCallback( 


    override fun onInserted(position: Int, count: Int) {

        for (i in position until position + count) {

            onAdded(new[i])

            onAdded(new[i], i)

        }

    }

packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaCarouselViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ constructor( 
                    immediatelyUpdateUi = commonModel.mediaLoadedModel.immediatelyUpdateUi,

                    controlViewModel = createMediaControlViewModel(instanceId),

                    onAdded = { onMediaControlAddedOrUpdated(it, commonModel) },

                    onRemoved = { _, _ ->

                    onRemoved = {

                        interactor.removeMediaControl(instanceId, delay = 0L)

                        mediaControlByInstanceId.remove(instanceId)

                    },
@@ -151,7 +151,7 @@ constructor( 
                    onAdded = { commonViewModel ->

                        onMediaRecommendationAddedOrUpdated(commonViewModel)

                    },

                    onRemoved = { _, immediatelyRemove ->

                    onRemoved = { immediatelyRemove ->

                        onMediaRecommendationRemoved(commonModel, immediatelyRemove)

                    },

                    onUpdated = { commonViewModel ->
@@ -170,7 +170,7 @@ constructor( 
            // This media control is due for removal as it is now paused + timed out, and resumption

            // setting is off.

            if (isReorderingAllowed()) {

                commonViewModel.onRemoved(commonViewModel, true)

                commonViewModel.onRemoved(true)

            } else {

                modelsPendingRemoval.add(commonModel)

            }
@@ -182,7 +182,7 @@ constructor( 
    private fun onMediaRecommendationAddedOrUpdated(commonViewModel: MediaCommonViewModel) {

        if (!interactor.isRecommendationActive()) {

            if (!mediaFlags.isPersistentSsCardEnabled()) {

                commonViewModel.onRemoved(commonViewModel, true)

                commonViewModel.onRemoved(true)

            }

        } else {

            // TODO (b/330897926) log smartspace card reported (SMARTSPACE_CARD_RECEIVED)

packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaCommonViewModel.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.internal.logging.InstanceId 
sealed class MediaCommonViewModel {



    abstract val onAdded: (MediaCommonViewModel) -> Unit

    abstract val onRemoved: (MediaCommonViewModel, Boolean) -> Unit

    abstract val onRemoved: (Boolean) -> Unit

    abstract val onUpdated: (MediaCommonViewModel) -> Unit



    data class MediaControl(
@@ -30,7 +30,7 @@ sealed class MediaCommonViewModel { 
        val immediatelyUpdateUi: Boolean,

        val controlViewModel: MediaControlViewModel,

        override val onAdded: (MediaCommonViewModel) -> Unit,

        override val onRemoved: (MediaCommonViewModel, Boolean) -> Unit,

        override val onRemoved: (Boolean) -> Unit,

        override val onUpdated: (MediaCommonViewModel) -> Unit,

    ) : MediaCommonViewModel()
@@ -39,7 +39,7 @@ sealed class MediaCommonViewModel { 
        val loadingEnabled: Boolean,

        val recsViewModel: MediaRecommendationsViewModel,

        override val onAdded: (MediaCommonViewModel) -> Unit,

        override val onRemoved: (MediaCommonViewModel, Boolean) -> Unit,

        override val onRemoved: (Boolean) -> Unit,

        override val onUpdated: (MediaCommonViewModel) -> Unit,

    ) : MediaCommonViewModel()

}