diff options
3 files changed, 7 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index b8da46ecfab0..b815f0c447d0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -692,7 +692,7 @@ public class MediaControlPanel { button.setImageDrawable(null); button.setContentDescription(null); button.setEnabled(false); - button.setBackground(mContext.getDrawable(R.drawable.qs_media_round_button_background)); + button.setBackground(null); } setVisibleAndAlpha(collapsedSet, button.getId(), mediaAction != null && showInCompact); diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index 5c36cab7e3c7..029ea9ad99f0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -700,7 +700,7 @@ class MediaDataManager( mediaActionIcon, runnable, action.title, - context.getDrawable(R.drawable.qs_media_round_button_background)) + null) actionIcons.add(mediaAction) } } @@ -809,7 +809,7 @@ class MediaDataManager( context.getDrawable(R.drawable.ic_media_prev), { controller.transportControls.skipToPrevious() }, context.getString(R.string.controls_media_button_prev), - context.getDrawable(R.drawable.qs_media_round_button_background) + null ) } PlaybackState.ACTION_SKIP_TO_NEXT -> { @@ -817,7 +817,7 @@ class MediaDataManager( context.getDrawable(R.drawable.ic_media_next), { controller.transportControls.skipToNext() }, context.getString(R.string.controls_media_button_next), - context.getDrawable(R.drawable.qs_media_round_button_background) + null ) } else -> null @@ -843,7 +843,7 @@ class MediaDataManager( Icon.createWithResource(packageName, it.icon).loadDrawable(context), { controller.transportControls.sendCustomAction(it, it.extras) }, it.name, - context.getDrawable(R.drawable.ic_media_pause_container) + null ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt index 04609ad25da9..63b3a7db40d3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt @@ -442,6 +442,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Validate first binding assertThat(actionPlayPause.isEnabled()).isTrue() assertThat(actionPlayPause.contentDescription).isEqualTo("play") + assertThat(actionPlayPause.getBackground()).isNull() verify(collapsedSet).setVisibility(R.id.actionPlayPause, ConstraintSet.VISIBLE) assertThat(actionPlayPause.hasOnClickListeners()).isTrue() @@ -467,6 +468,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Validate correct state was bound assertThat(actionPlayPause.contentDescription).isEqualTo("loading") + assertThat(actionPlayPause.getBackground()).isNull() verify(mockAvd0, times(1)) .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) verify(mockAvd1, times(1) |