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

Commit 37ec82b7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am:... 

Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am: 12305746" into udc-d1-dev am: 681c751a

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



Change-Id: I7d5b8003fee5f01cb72b1723ada2391f32f62139
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 422cabc7 681c751a

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;

        }

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

+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)

    }