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

Commit 2279b3a1 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "Keep metadata and buttons in the same position" into tm-qpr-dev am: 71d3dbf2 

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



Change-Id: I328580316dd337b61ad9a38733f7e0d8cefe4214
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97c4f7a0 71d3dbf2

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

+3 −13
Original line number Diff line number Diff line
@@ -940,19 +940,9 @@ public class MediaControlPanel { 
        if (mIsSeekBarEnabled) {

            return ConstraintSet.VISIBLE;

        }

        // If disabled and "neighbours" are visible, set progress bar to INVISIBLE instead of GONE

        // so layout weights still work.

        return areAnyExpandedBottomActionsVisible() ? ConstraintSet.INVISIBLE : ConstraintSet.GONE;

    }



    private boolean areAnyExpandedBottomActionsVisible() {

        ConstraintSet expandedSet = mMediaViewController.getExpandedLayout();

        for (int id : MediaViewHolder.Companion.getExpandedBottomActionIds()) {

            if (expandedSet.getVisibility(id) == ConstraintSet.VISIBLE) {

                return true;

            }

        }

        return false;

        // Set progress bar to INVISIBLE to keep the positions of text and buttons similar to the

        // original positions when seekbar is enabled.

        return ConstraintSet.INVISIBLE;

    }



    private void setGenericButton(

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

+4 −4
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    }



    @Test

    fun bind_seekBarDisabled_noActions_seekBarVisibilityIsSetToGone() {

    fun bind_seekBarDisabled_noActions_seekBarVisibilityIsSetToInvisible() {

        useRealConstraintSets()



        val state = mediaData.copy(semanticActions = MediaButton())
@@ -711,7 +711,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        player.bindPlayer(state, PACKAGE)



        assertThat(expandedSet.getVisibility(seekBar.id)).isEqualTo(ConstraintSet.GONE)

        assertThat(expandedSet.getVisibility(seekBar.id)).isEqualTo(ConstraintSet.INVISIBLE)

    }



    @Test
@@ -741,7 +741,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    }



    @Test

    fun seekBarChangesToDisabledAfterBind_noActions_seekBarChangesToGone() {

    fun seekBarChangesToDisabledAfterBind_noActions_seekBarChangesToInvisible() {

        useRealConstraintSets()



        val state = mediaData.copy(semanticActions = MediaButton())
@@ -752,7 +752,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        getEnabledChangeListener().onEnabledChanged(enabled = false)



        assertThat(expandedSet.getVisibility(seekBar.id)).isEqualTo(ConstraintSet.GONE)

        assertThat(expandedSet.getVisibility(seekBar.id)).isEqualTo(ConstraintSet.INVISIBLE)

    }



    @Test