Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep metadata and buttons in the same position

Browse Source 
it sets the seekbar visibility to invisible when it should be disabled.
So it keeps the space for the seekbar available which keeps the
positions of other UI components in the same original position.

Bug: 249989837
Test: atest MediaControlPanelTest
Test: Checked the new changes applied on UMO UI.
Change-Id: I77131a60bc6bce87e326828fe5d799538b19f16c
This commit is contained in:
Michael Mikhail
2022-12-05 21:48:37 +00:00
parent 0ff970a960
commit 06e7f9fe5a
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(

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

@@ -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