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

Commit 03de78e7 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "[Media] Update player's a11y content description based on whether guts... 

Merge "[Media] Update player's a11y content description based on whether guts is open or not." into tm-dev am: 3d32cfd3

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



Change-Id: I203193de3f6bc3e234905bb637054b23f75eee9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 905e09ed 3d32cfd3

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

+27 −6
Original line number Original line Diff line number Diff line
@@ -448,6 +448,7 @@ public class MediaControlPanel { 




        bindOutputSwitcherChip(data);

        bindOutputSwitcherChip(data);

        bindGutsMenuForPlayer(data);

        bindGutsMenuForPlayer(data);

        bindPlayerContentDescription(data);

        bindScrubbingTime(data);

        bindScrubbingTime(data);

        bindActionButtons(data);

        bindActionButtons(data);
@@ -541,12 +542,6 @@ public class MediaControlPanel { 
    }

    }





    private boolean bindSongMetadata(MediaData data) {

    private boolean bindSongMetadata(MediaData data) {

        // Accessibility label

        mMediaViewHolder.getPlayer().setContentDescription(

                mContext.getString(

                        R.string.controls_media_playing_item_description,

                        data.getSong(), data.getArtist(), data.getApp()));



        TextView titleText = mMediaViewHolder.getTitleText();

        TextView titleText = mMediaViewHolder.getTitleText();

        TextView artistText = mMediaViewHolder.getArtistText();

        TextView artistText = mMediaViewHolder.getArtistText();

        return mMetadataAnimationHandler.setNext(

        return mMetadataAnimationHandler.setNext(
@@ -568,6 +563,26 @@ public class MediaControlPanel { 
            });

            });

    }

    }





    private void bindPlayerContentDescription(MediaData data) {

        if (mMediaViewHolder == null) {

            return;

        }



        CharSequence contentDescription;

        if (mMediaViewController.isGutsVisible()) {

            contentDescription = mMediaViewHolder.getGutsViewHolder().getGutsText().getText();

        } else if (data != null) {

            contentDescription = mContext.getString(

                    R.string.controls_media_playing_item_description,

                    data.getSong(),

                    data.getArtist(),

                    data.getApp());

        } else {

            contentDescription = null;

        }

        mMediaViewHolder.getPlayer().setContentDescription(contentDescription);

    }



    private void bindArtworkAndColors(MediaData data, boolean updateBackground) {

    private void bindArtworkAndColors(MediaData data, boolean updateBackground) {

        final int reqId = mArtworkNextBindRequestId++;

        final int reqId = mArtworkNextBindRequestId++;

        if (updateBackground) {

        if (updateBackground) {
@@ -1179,6 +1194,9 @@ public class MediaControlPanel { 
            mRecommendationViewHolder.marquee(false, mMediaViewController.GUTS_ANIMATION_DURATION);

            mRecommendationViewHolder.marquee(false, mMediaViewController.GUTS_ANIMATION_DURATION);

        }

        }

        mMediaViewController.closeGuts(immediate);

        mMediaViewController.closeGuts(immediate);

        if (mMediaViewHolder != null) {

            bindPlayerContentDescription(mMediaData);

        }

    }

    }





    private void closeGuts() {

    private void closeGuts() {
@@ -1192,6 +1210,9 @@ public class MediaControlPanel { 
            mRecommendationViewHolder.marquee(true, mMediaViewController.GUTS_ANIMATION_DURATION);

            mRecommendationViewHolder.marquee(true, mMediaViewController.GUTS_ANIMATION_DURATION);

        }

        }

        mMediaViewController.openGuts();

        mMediaViewController.openGuts();

        if (mMediaViewHolder != null) {

            bindPlayerContentDescription(mMediaData);

        }

        mLogger.logLongPressOpen(mUid, mPackageName, mInstanceId);

        mLogger.logLongPressOpen(mUid, mPackageName, mInstanceId);

    }

    }

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

+85 −0
Original line number Original line Diff line number Diff line
@@ -1122,6 +1122,91 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        verify(mediaCarouselController).removePlayer(eq(mediaKey), eq(false), eq(false))

        verify(mediaCarouselController).removePlayer(eq(mediaKey), eq(false), eq(false))

    }

    }





    @Test

    fun player_gutsOpen_contentDescriptionIsForGuts() {

        whenever(mediaViewController.isGutsVisible).thenReturn(true)

        player.attachPlayer(viewHolder)



        val gutsTextString = "gutsText"

        whenever(gutsText.text).thenReturn(gutsTextString)

        player.bindPlayer(mediaData, KEY)



        val descriptionCaptor = ArgumentCaptor.forClass(CharSequence::class.java)

        verify(viewHolder.player).contentDescription = descriptionCaptor.capture()

        val description = descriptionCaptor.value.toString()



        assertThat(description).isEqualTo(gutsTextString)

    }



    @Test

    fun player_gutsClosed_contentDescriptionIsForPlayer() {

        whenever(mediaViewController.isGutsVisible).thenReturn(false)

        player.attachPlayer(viewHolder)



        val app = "appName"

        player.bindPlayer(mediaData.copy(app = app), KEY)



        val descriptionCaptor = ArgumentCaptor.forClass(CharSequence::class.java)

        verify(viewHolder.player).contentDescription = descriptionCaptor.capture()

        val description = descriptionCaptor.value.toString()



        assertThat(description).contains(mediaData.song!!)

        assertThat(description).contains(mediaData.artist!!)

        assertThat(description).contains(app)

    }



    @Test

    fun player_gutsChangesFromOpenToClosed_contentDescriptionUpdated() {

        // Start out open

        whenever(mediaViewController.isGutsVisible).thenReturn(true)

        whenever(gutsText.text).thenReturn("gutsText")

        player.attachPlayer(viewHolder)

        val app = "appName"

        player.bindPlayer(mediaData.copy(app = app), KEY)



        // Update to closed by long pressing

        val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)

        verify(viewHolder.player).onLongClickListener = captor.capture()

        reset(viewHolder.player)



        whenever(mediaViewController.isGutsVisible).thenReturn(false)

        captor.value.onLongClick(viewHolder.player)



        // Then content description is now the player content description

        val descriptionCaptor = ArgumentCaptor.forClass(CharSequence::class.java)

        verify(viewHolder.player).contentDescription = descriptionCaptor.capture()

        val description = descriptionCaptor.value.toString()



        assertThat(description).contains(mediaData.song!!)

        assertThat(description).contains(mediaData.artist!!)

        assertThat(description).contains(app)

    }



    @Test

    fun player_gutsChangesFromClosedToOpen_contentDescriptionUpdated() {

        // Start out closed

        whenever(mediaViewController.isGutsVisible).thenReturn(false)

        val gutsTextString = "gutsText"

        whenever(gutsText.text).thenReturn(gutsTextString)

        player.attachPlayer(viewHolder)

        player.bindPlayer(mediaData.copy(app = "appName"), KEY)



        // Update to open by long pressing

        val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)

        verify(viewHolder.player).onLongClickListener = captor.capture()

        reset(viewHolder.player)



        whenever(mediaViewController.isGutsVisible).thenReturn(true)

        captor.value.onLongClick(viewHolder.player)



        // Then content description is now the guts content description

        val descriptionCaptor = ArgumentCaptor.forClass(CharSequence::class.java)

        verify(viewHolder.player).contentDescription = descriptionCaptor.capture()

        val description = descriptionCaptor.value.toString()



        assertThat(description).isEqualTo(gutsTextString)

    }



    /* ***** END guts tests for the player ***** */

    /* ***** END guts tests for the player ***** */





    /* ***** Guts tests for the recommendations ***** */

    /* ***** Guts tests for the recommendations ***** */