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

Commit 03f06c2d authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Fix warnings" into tm-dev am: f3aafb7a am: 8cdd16a6 am: c6b53a16 

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



Change-Id: I2daea56549d79c4f264b212eaaf5b0f8076f18f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a430d6c c6b53a16

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

+5 −9
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ class MediaCarouselController @Inject constructor( 
    private val visualStabilityCallback: OnReorderingAllowedListener

    private var needsReordering: Boolean = false

    private var keysNeedRemoval = mutableSetOf<String>()

    protected var shouldScrollToActivePlayer: Boolean = false

    var shouldScrollToActivePlayer: Boolean = false

    private var isRtl: Boolean = false

        set(value) {

            if (value != field) {
@@ -413,9 +413,7 @@ class MediaCarouselController @Inject constructor( 
                            .indexOfFirst { key -> it == key }

                    mediaCarouselScrollHandler

                            .scrollToPlayer(previousVisibleIndex, activeMediaIndex)

                } ?: {

                    mediaCarouselScrollHandler.scrollToPlayer(destIndex = activeMediaIndex)

                }

                } ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = activeMediaIndex)

            }

        }

    }
@@ -432,7 +430,7 @@ class MediaCarouselController @Inject constructor( 
        val curVisibleMediaKey = MediaPlayerData.playerKeys()

                .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)

        if (existingPlayer == null) {

            var newPlayer = mediaControlPanelFactory.get()

            val newPlayer = mediaControlPanelFactory.get()

            newPlayer.attachPlayer(MediaViewHolder.create(

                    LayoutInflater.from(context), mediaContent))

            newPlayer.mediaViewController.sizeChangedListener = this::updateCarouselDimensions
@@ -480,7 +478,7 @@ class MediaCarouselController @Inject constructor( 
            MediaPlayerData.removeMediaPlayer(existingSmartspaceMediaKey)

        }



        var newRecs = mediaControlPanelFactory.get()

        val newRecs = mediaControlPanelFactory.get()

        newRecs.attachRecommendation(

                RecommendationViewHolder.create(LayoutInflater.from(context), mediaContent))

        newRecs.mediaViewController.sizeChangedListener = this::updateCarouselDimensions
@@ -1048,7 +1046,5 @@ internal object MediaPlayerData { 
        return false

    }



    fun isSsReactivated(key: String): Boolean = mediaData.get(key)?.let {

        it.isSsReactivated

    } ?: false

    fun isSsReactivated(key: String): Boolean = mediaData.get(key)?.isSsReactivated ?: false

}
 
 No newline at end of file