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

Commit 4fd8e95b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Scrim now only scales horizontally" into tm-dev am: d2d85c57 am: efb9077d"

parents 832f49fa 10f7c1ca

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

+4 −0
Original line number Diff line number Diff line
@@ -636,6 +636,10 @@ public class MediaControlPanel { 
                    mIsArtworkBound = isArtworkBound;

                }



                // Scrim bounds are set manually so it scales as expected

                albumView.getForeground().setBounds(0, 0,

                        Math.max(width, height), Math.max(width, height));



                // Transition Colors to current color scheme

                mColorSchemeTransition.updateColorScheme(colorScheme, mIsArtworkBound);

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

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.AnimatorSet 
import android.app.PendingIntent

import android.app.smartspace.SmartspaceAction

import android.content.Context

import org.mockito.Mockito.`when` as whenever

import android.content.Intent

import android.content.pm.ApplicationInfo

import android.content.pm.PackageManager
@@ -67,8 +66,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController 
import com.android.systemui.util.animation.TransitionLayout

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.mockito.KotlinArgumentCaptor

import com.android.systemui.util.mockito.argumentCaptor

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argumentCaptor

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.nullable

import com.android.systemui.util.mockito.withArgCaptor
@@ -92,6 +91,7 @@ import org.mockito.Mockito.reset 
import org.mockito.Mockito.times

import org.mockito.Mockito.verify

import org.mockito.junit.MockitoJUnit

import org.mockito.Mockito.`when` as whenever



private const val KEY = "TEST_KEY"

private const val PACKAGE = "PKG"
@@ -339,6 +339,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        whenever(viewHolder.player).thenReturn(view)

        whenever(viewHolder.appIcon).thenReturn(appIcon)

        whenever(viewHolder.albumView).thenReturn(albumView)

        whenever(albumView.foreground).thenReturn(mock(Drawable::class.java))

        whenever(viewHolder.titleText).thenReturn(titleText)

        whenever(viewHolder.artistText).thenReturn(artistText)

        whenever(seamlessBackground.getDrawable(0)).thenReturn(mock(GradientDrawable::class.java))