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

Commit a7ac48b1 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Fix an issue with default background" into tm-dev

parents 3ab801d3 acbd2ebe

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+4 −4
Original line number Diff line number Diff line
@@ -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

        )

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -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)