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

Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am: 123057466d" into udc-d1-dev

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-05-13 00:29:20 +00:00
committed by Android (Google) Code Review
parent c04b7a53f1 cfa3db2d7d
commit 681c751a0a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1235,6 +1235,8 @@ public class MediaControlPanel {
if ((buttonId == R.id.actionPrev && semanticActions.getReservePrev()) if ((buttonId == R.id.actionPrev && semanticActions.getReservePrev())
|| (buttonId == R.id.actionNext && semanticActions.getReserveNext())) { || (buttonId == R.id.actionNext && semanticActions.getReserveNext())) {
notVisibleValue = ConstraintSet.INVISIBLE; notVisibleValue = ConstraintSet.INVISIBLE;
mMediaViewHolder.getAction(buttonId).setFocusable(visible);
mMediaViewHolder.getAction(buttonId).setClickable(visible);
} else { } else {
notVisibleValue = ConstraintSet.GONE; notVisibleValue = ConstraintSet.GONE;
} }

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

@@ -530,6 +530,8 @@ public class MediaControlPanelTest : SysuiTestCase() {
verify(collapsedSet).setVisibility(R.id.actionPlayPause, ConstraintSet.VISIBLE) verify(collapsedSet).setVisibility(R.id.actionPlayPause, ConstraintSet.VISIBLE)
assertThat(actionNext.isEnabled()).isTrue() assertThat(actionNext.isEnabled()).isTrue()
assertThat(actionNext.isFocusable()).isTrue()
assertThat(actionNext.isClickable()).isTrue()
assertThat(actionNext.contentDescription).isEqualTo("next") assertThat(actionNext.contentDescription).isEqualTo("next")
verify(collapsedSet).setVisibility(R.id.actionNext, ConstraintSet.VISIBLE) verify(collapsedSet).setVisibility(R.id.actionNext, ConstraintSet.VISIBLE)
@@ -576,6 +578,8 @@ public class MediaControlPanelTest : SysuiTestCase() {
assertThat(actionPrev.isEnabled()).isFalse() assertThat(actionPrev.isEnabled()).isFalse()
assertThat(actionPrev.drawable).isNull() assertThat(actionPrev.drawable).isNull()
assertThat(actionPrev.isFocusable()).isFalse()
assertThat(actionPrev.isClickable()).isFalse()
verify(expandedSet).setVisibility(R.id.actionPrev, ConstraintSet.INVISIBLE) verify(expandedSet).setVisibility(R.id.actionPrev, ConstraintSet.INVISIBLE)
assertThat(actionNext.isEnabled()).isFalse() assertThat(actionNext.isEnabled()).isFalse()
@@ -610,6 +614,8 @@ public class MediaControlPanelTest : SysuiTestCase() {
assertThat(actionNext.isEnabled()).isFalse() assertThat(actionNext.isEnabled()).isFalse()
assertThat(actionNext.drawable).isNull() assertThat(actionNext.drawable).isNull()
assertThat(actionNext.isFocusable()).isFalse()
assertThat(actionNext.isClickable()).isFalse()
verify(expandedSet).setVisibility(R.id.actionNext, ConstraintSet.INVISIBLE) verify(expandedSet).setVisibility(R.id.actionNext, ConstraintSet.INVISIBLE)
} }