Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Caitlin Cassidy
2022-05-09 14:28:25 +00:00
committed by Android (Google) Code Review
parent a3f6dae96f b5c0f6c60c
commit 3d32cfd3b0
2 changed files with 112 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -448,6 +448,7 @@ public class MediaControlPanel {
bindOutputSwitcherChip(data);
bindGutsMenuForPlayer(data);
bindPlayerContentDescription(data);
bindScrubbingTime(data);
bindActionButtons(data);
@@ -541,12 +542,6 @@ public class MediaControlPanel {
}
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 artistText = mMediaViewHolder.getArtistText();
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) {
final int reqId = mArtworkNextBindRequestId++;
if (updateBackground) {
@@ -1179,6 +1194,9 @@ public class MediaControlPanel {
mRecommendationViewHolder.marquee(false, mMediaViewController.GUTS_ANIMATION_DURATION);
}
mMediaViewController.closeGuts(immediate);
if (mMediaViewHolder != null) {
bindPlayerContentDescription(mMediaData);
}
}
private void closeGuts() {
@@ -1192,6 +1210,9 @@ public class MediaControlPanel {
mRecommendationViewHolder.marquee(true, mMediaViewController.GUTS_ANIMATION_DURATION);
}
mMediaViewController.openGuts();
if (mMediaViewHolder != null) {
bindPlayerContentDescription(mMediaData);
}
mLogger.logLongPressOpen(mUid, mPackageName, mInstanceId);
}

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

@@ -1122,6 +1122,91 @@ public class MediaControlPanelTest : SysuiTestCase() {
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 ***** */
/* ***** Guts tests for the recommendations ***** */