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

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

Merge "Close guts during transitions" into sc-dev am: 90cff49c 

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

Change-Id: I7e162a66e481d1b42eb947227b0910999bdd197b
parents 8f01d329 90cff49c

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

+10 −2
Original line number Diff line number Diff line
@@ -535,12 +535,20 @@ class MediaCarouselController @Inject constructor( 
            this.desiredLocation = desiredLocation

            this.desiredHostState = it

            currentlyExpanded = it.expansion > 0



            val shouldCloseGuts = !currentlyExpanded && !mediaManager.hasActiveMedia() &&

                    desiredHostState.showsOnlyActiveMedia



            for (mediaPlayer in MediaPlayerData.players()) {

                if (animate) {

                    mediaPlayer.mediaViewController.animatePendingStateChange(

                            duration = duration,

                            delay = startDelay)

                }

                if (shouldCloseGuts && mediaPlayer.mediaViewController.isGutsVisible) {

                    mediaPlayer.closeGuts(!animate)

                }



                mediaPlayer.mediaViewController.onLocationPreChange(desiredLocation)

            }

            mediaCarouselScrollHandler.showsSettingsButton = !it.showsOnlyActiveMedia
@@ -556,9 +564,9 @@ class MediaCarouselController @Inject constructor( 
        }

    }



    fun closeGuts() {

    fun closeGuts(immediate: Boolean = true) {

        MediaPlayerData.players().forEach {

            it.closeGuts(true)

            it.closeGuts(immediate)

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class MediaCarouselScrollHandler( 
    private val mainExecutor: DelayableExecutor,

    private val dismissCallback: () -> Unit,

    private var translationChangedListener: () -> Unit,

    private val closeGuts: () -> Unit,

    private val closeGuts: (immediate: Boolean) -> Unit,

    private val falsingCollector: FalsingCollector,

    private val falsingManager: FalsingManager,

    private val logSmartspaceImpression: () -> Unit
@@ -473,7 +473,7 @@ class MediaCarouselScrollHandler( 
            if (oldIndex != visibleMediaIndex && visibleToUser) {

                logSmartspaceImpression()

            }

            closeGuts()

            closeGuts(false)

            updatePlayerVisibilities()

        }

        val relativeLocation = visibleMediaIndex.toFloat() + if (playerWidthPlusPadding > 0)

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ public class MediaControlPanel { 
                mMediaViewController.openGuts();

                return true;

            } else {

                return false;

                closeGuts();

                return true;

            }

        });

        mPlayerViewHolder.getCancel().setOnClickListener(v -> {

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

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ class MediaHierarchyManager @Inject constructor( 
                } else {

                    updateDesiredLocation()

                    qsExpanded = false

                    closeGuts()

                }

                mediaCarouselController.mediaCarouselScrollHandler.visibleToUser = isVisibleToUser()

            }

packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        captor.value.onLongClick(holder.player)

        verify(mediaViewController, never()).openGuts()

        verify(mediaViewController).closeGuts(false)

    }



    @Test