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

Commit bfe9ec94 authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Remove redundant code after merging into flexiglass 

Flag: com.android.systemui.scene_container
Bug: 326408371
Test: Build.
Change-Id: If8cfbd1bf6c6808c7eefda20181549ff1b6a201b
parent 753160d9

packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt

+0 −16
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Co 
import com.android.systemui.media.controls.ui.viewmodel.MediaOutputSwitcherViewModel

import com.android.systemui.media.controls.ui.viewmodel.MediaPlayerViewModel

import com.android.systemui.media.controls.util.MediaDataUtils

import com.android.systemui.media.controls.util.MediaFlags

import com.android.systemui.monet.ColorScheme

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.res.R
@@ -76,7 +75,6 @@ object MediaControlViewBinder { 
        falsingManager: FalsingManager,

        @Background backgroundDispatcher: CoroutineDispatcher,

        @Main mainDispatcher: CoroutineDispatcher,

        mediaFlags: MediaFlags,

    ) {

        val mediaCard = viewHolder.player

        mediaCard.repeatWhenAttached {
@@ -91,7 +89,6 @@ object MediaControlViewBinder { 
                                falsingManager,

                                backgroundDispatcher,

                                mainDispatcher,

                                mediaFlags

                            )

                        }

                    }
@@ -107,7 +104,6 @@ object MediaControlViewBinder { 
        falsingManager: FalsingManager,

        backgroundDispatcher: CoroutineDispatcher,

        mainDispatcher: CoroutineDispatcher,

        mediaFlags: MediaFlags,

    ) {

        // Set up media control location and its listener.

        viewModel.onLocationChanged(viewController.currentEndLocation)
@@ -164,18 +160,6 @@ object MediaControlViewBinder { 
            isSongUpdated

        )



        // TODO: We don't need to refresh this state constantly, only if the

        // state actually changed to something which might impact the

        // measurement. State refresh interferes with the translation

        // animation, only run it if it's not running.

        if (!viewController.metadataAnimationHandler.isRunning) {

            // Don't refresh in scene framework, because it will calculate

            // with invalid layout sizes

            if (!mediaFlags.isSceneContainerEnabled()) {

                viewController.refreshState()

            }

        }



        if (viewModel.playTurbulenceNoise) {

            viewController.setUpTurbulenceNoise()

        }

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+0 −1
Original line number Diff line number Diff line
@@ -746,7 +746,6 @@ constructor( 
                    falsingManager,

                    backgroundDispatcher,

                    mainDispatcher,

                    mediaFlags

                )

                mediaContent.addView(viewHolder.player, position)

                controllerById[commonViewModel.instanceId.toString()] = viewController