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

Commit 8fb30b01 authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Don't let a11y tools to focus on the empty device suggestion container. 

Fix: 438879224
Fix: 438451561
Test: atest MediaCarouselPanelTest
Test: On a physical device
Flag: com.android.systemui.enable_suggested_device_ui
Change-Id: I1d139fa17778c2be6357cf4ef6b4177f4dfe3258
parent 2a4ed5a4

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

+7 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ public class MediaControlPanel { 
            return;

        }

        View deviceSuggestionButton = mMediaViewHolder.getDeviceSuggestionButton();

        View deviceSuggestionContainer = mMediaViewHolder.getDeviceSuggestionContainer();

        TextView deviceText = mMediaViewHolder.getSeamlessText();

        @Nullable SuggestionData suggestionData = data.getSuggestionData();

        if (suggestionData != null) {
@@ -639,10 +640,16 @@ public class MediaControlPanel { 
                setSuggestionText(suggestionDeviceData);

                setSuggestionIcon(suggestionDeviceData);

                deviceSuggestionButton.setVisibility(View.VISIBLE);

                deviceSuggestionContainer.setImportantForAccessibility(

                        View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

                return;

            }

        }

        deviceSuggestionButton.setVisibility(View.GONE);

        // Change the importantForAccessibility attribute instead of visibility since the latter

        // is manipulated by the TransitionLayout and the Guts animation logic.

        deviceSuggestionContainer.setImportantForAccessibility(

                View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

        deviceText.setVisibility(View.VISIBLE);

        return;

    }

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

+12 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

            .isEqualTo(mContext.getString(R.string.media_suggestion_disconnected_text, DEVICE_NAME))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.VISIBLE)
@@ -1239,6 +1241,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

            .isEqualTo(mContext.getString(R.string.media_suggestion_disconnected_text, DEVICE_NAME))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.GONE)
@@ -1261,6 +1265,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

            .isEqualTo(mContext.getString(R.string.media_suggestion_failure_text))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.VISIBLE)
@@ -1282,6 +1288,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }



    @Test
@@ -1293,6 +1301,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }



    @Test
@@ -1311,6 +1321,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(seamlessText.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionButton.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }



    /* ***** Guts tests for the player ***** */