Merge "Do not allow focus on invisible buttons" into udc-dev (12305746) · Commits · e / os / android_frameworks_base

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

+2 −0

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -530,6 +530,8 @@ public class MediaControlPanelTest : SysuiTestCase() {
		verify(collapsedSet).setVisibility(R.id.actionPlayPause, ConstraintSet.VISIBLE)

		assertThat(actionNext.isEnabled()).isTrue()
		assertThat(actionNext.isFocusable()).isTrue()
		assertThat(actionNext.isClickable()).isTrue()
		assertThat(actionNext.contentDescription).isEqualTo("next")
		verify(collapsedSet).setVisibility(R.id.actionNext, ConstraintSet.VISIBLE)

		@@ -576,6 +578,8 @@ public class MediaControlPanelTest : SysuiTestCase() {

		assertThat(actionPrev.isEnabled()).isFalse()
		assertThat(actionPrev.drawable).isNull()
		assertThat(actionPrev.isFocusable()).isFalse()
		assertThat(actionPrev.isClickable()).isFalse()
		verify(expandedSet).setVisibility(R.id.actionPrev, ConstraintSet.INVISIBLE)

		assertThat(actionNext.isEnabled()).isFalse()
		@@ -610,6 +614,8 @@ public class MediaControlPanelTest : SysuiTestCase() {

		assertThat(actionNext.isEnabled()).isFalse()
		assertThat(actionNext.drawable).isNull()
		assertThat(actionNext.isFocusable()).isFalse()
		assertThat(actionNext.isClickable()).isFalse()
		verify(expandedSet).setVisibility(R.id.actionNext, ConstraintSet.INVISIBLE)
		}