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

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

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

Change-Id: I739eed375cee603500361a6f7a63e8d0330d0bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2022-05-07 00:22:04 +00:00
committed by Automerger Merge Worker
parent c88755c7db d2d85c578d
commit 8c452a6531
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -636,6 +636,10 @@ public class MediaControlPanel {
mIsArtworkBound = isArtworkBound; 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 // Transition Colors to current color scheme
mColorSchemeTransition.updateColorScheme(colorScheme, mIsArtworkBound); mColorSchemeTransition.updateColorScheme(colorScheme, mIsArtworkBound);

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

@@ -21,7 +21,6 @@ import android.animation.AnimatorSet
import android.app.PendingIntent import android.app.PendingIntent
import android.app.smartspace.SmartspaceAction import android.app.smartspace.SmartspaceAction
import android.content.Context import android.content.Context
import org.mockito.Mockito.`when` as whenever
import android.content.Intent import android.content.Intent
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager 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.animation.TransitionLayout
import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.concurrency.FakeExecutor
import com.android.systemui.util.mockito.KotlinArgumentCaptor 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.any
import com.android.systemui.util.mockito.argumentCaptor
import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.eq
import com.android.systemui.util.mockito.nullable import com.android.systemui.util.mockito.nullable
import com.android.systemui.util.mockito.withArgCaptor 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.times
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoJUnit
import org.mockito.Mockito.`when` as whenever
private const val KEY = "TEST_KEY" private const val KEY = "TEST_KEY"
private const val PACKAGE = "PKG" private const val PACKAGE = "PKG"
@@ -339,6 +339,7 @@ public class MediaControlPanelTest : SysuiTestCase() {
whenever(viewHolder.player).thenReturn(view) whenever(viewHolder.player).thenReturn(view)
whenever(viewHolder.appIcon).thenReturn(appIcon) whenever(viewHolder.appIcon).thenReturn(appIcon)
whenever(viewHolder.albumView).thenReturn(albumView) whenever(viewHolder.albumView).thenReturn(albumView)
whenever(albumView.foreground).thenReturn(mock(Drawable::class.java))
whenever(viewHolder.titleText).thenReturn(titleText) whenever(viewHolder.titleText).thenReturn(titleText)
whenever(viewHolder.artistText).thenReturn(artistText) whenever(viewHolder.artistText).thenReturn(artistText)
whenever(seamlessBackground.getDrawable(0)).thenReturn(mock(GradientDrawable::class.java)) whenever(seamlessBackground.getDrawable(0)).thenReturn(mock(GradientDrawable::class.java))