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

Commit c8bc6384 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Remeasure entire carousel view when players change" into sc-v2-dev am: 64186143 

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

Change-Id: Icdc60021a8bcd2c7a7a44b326ceb9183c4c51732
parents 90f5b92d 64186143

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

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ class MediaCarouselController @Inject constructor( 
        }

        updatePageIndicator()

        mediaCarouselScrollHandler.onPlayersChanged()

        mediaCarousel.requiresRemeasuring = true

        mediaFrame.requiresRemeasuring = true

        // Check postcondition: mediaContent should have the same number of children as there are

        // elements in mediaPlayers.

        if (MediaPlayerData.players().size != mediaContent.childCount) {
@@ -439,7 +439,7 @@ class MediaCarouselController @Inject constructor( 
        updatePlayerToState(newRecs, noAnimation = true)

        reorderAllPlayers(curVisibleMediaKey)

        updatePageIndicator()

        mediaCarousel.requiresRemeasuring = true

        mediaFrame.requiresRemeasuring = true

        // Check postcondition: mediaContent should have the same number of children as there are

        // elements in mediaPlayers.

        if (MediaPlayerData.players().size != mediaContent.childCount) {