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

Commit ade19de9 authored by Alexandr Shabalin's avatar Alexandr Shabalin Committed by Android (Google) Code Review
Browse files

Merge "Don't let a11y tools to focus on the empty device suggestion container." into main

parents 54960e0b 8fb30b01

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

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

            return;

        }

        }

        View deviceSuggestionButton = mMediaViewHolder.getDeviceSuggestionButton();

        View deviceSuggestionButton = mMediaViewHolder.getDeviceSuggestionButton();

        View deviceSuggestionContainer = mMediaViewHolder.getDeviceSuggestionContainer();

        TextView deviceText = mMediaViewHolder.getSeamlessText();

        TextView deviceText = mMediaViewHolder.getSeamlessText();

        @Nullable SuggestionData suggestionData = data.getSuggestionData();

        @Nullable SuggestionData suggestionData = data.getSuggestionData();

        if (suggestionData != null) {

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

                setSuggestionText(suggestionDeviceData);

                setSuggestionIcon(suggestionDeviceData);

                setSuggestionIcon(suggestionDeviceData);

                deviceSuggestionButton.setVisibility(View.VISIBLE);

                deviceSuggestionButton.setVisibility(View.VISIBLE);

                deviceSuggestionContainer.setImportantForAccessibility(

                        View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

                return;

                return;

            }

            }

        }

        }

        deviceSuggestionButton.setVisibility(View.GONE);

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

        deviceText.setVisibility(View.VISIBLE);

        return;

        return;

    }

    }

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

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




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

        assertThat(deviceSuggestionText.text)

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

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

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

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




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

        assertThat(deviceSuggestionText.text)

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

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

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

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




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO)

        assertThat(deviceSuggestionText.text)

        assertThat(deviceSuggestionText.text)

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

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

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

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




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }

    }





    @Test

    @Test
@@ -1294,6 +1302,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }

    }





    @Test

    @Test
@@ -1312,6 +1322,8 @@ public class MediaControlPanelTest : SysuiTestCase() { 




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

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

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

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

        assertThat(deviceSuggestionContainer.importantForAccessibility)

            .isEqualTo(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)

    }

    }





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

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