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

Merge "Squishy ViewState no longer mutates global album art widgetState" into tm-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-05-06 14:30:38 +00:00
committed by Android (Google) Code Review
parent b5863e8d6c c5c41e1be7
commit 4b33784612
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt
View File

@@ -278,13 +278,14 @@ class MediaViewController @Inject constructor(
/** /**
* Apply squishFraction to a copy of viewState such that the cached version is untouched. * Apply squishFraction to a copy of viewState such that the cached version is untouched.
*/ */
private fun squishViewState( @VisibleForTesting
internal fun squishViewState(
viewState: TransitionViewState, viewState: TransitionViewState,
squishFraction: Float squishFraction: Float
): TransitionViewState { ): TransitionViewState {
val squishedViewState = viewState.copy() val squishedViewState = viewState.copy()
squishedViewState.height = (squishedViewState.height * squishFraction).toInt() squishedViewState.height = (squishedViewState.height * squishFraction).toInt()
val albumArtViewState = viewState.widgetStates.get(R.id.album_art) val albumArtViewState = squishedViewState.widgetStates.get(R.id.album_art)
if (albumArtViewState != null) { if (albumArtViewState != null) {
albumArtViewState.height = squishedViewState.height albumArtViewState.height = squishedViewState.height
} }
@@ -317,6 +318,7 @@ class MediaViewController @Inject constructor(
if (transitionLayout == null) { if (transitionLayout == null) {
return null return null
} }
// Not cached. Let's create a new measurement // Not cached. Let's create a new measurement
if (state.expansion == 0.0f || state.expansion == 1.0f) { if (state.expansion == 0.0f || state.expansion == 1.0f) {
result = transitionLayout!!.calculateViewState( result = transitionLayout!!.calculateViewState(

20
packages/SystemUI/tests/src/com/android/systemui/media/MediaViewControllerTest.kt
View File

@@ -4,16 +4,22 @@ import android.testing.AndroidTestingRunner
import android.testing.TestableLooper import android.testing.TestableLooper
import android.view.View import android.view.View
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.systemui.R
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.util.animation.MeasurementInput import com.android.systemui.util.animation.MeasurementInput
import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.animation.TransitionLayout
import com.android.systemui.util.animation.TransitionViewState import com.android.systemui.util.animation.TransitionViewState
import com.android.systemui.util.animation.WidgetState
import junit.framework.Assert.assertTrue import junit.framework.Assert.assertTrue
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import org.mockito.Mockito.`when` as whenever
/** /**
* Tests for {@link MediaViewController}. * Tests for {@link MediaViewController}.
@@ -31,6 +37,9 @@ class MediaViewControllerTest : SysuiTestCase() {
private lateinit var mediaViewController: MediaViewController private lateinit var mediaViewController: MediaViewController
private val mediaHostStateHolder = MediaHost.MediaHostStateHolder() private val mediaHostStateHolder = MediaHost.MediaHostStateHolder()
private var transitionLayout = TransitionLayout(context, /* attrs */ null, /* defStyleAttr */ 0) private var transitionLayout = TransitionLayout(context, /* attrs */ null, /* defStyleAttr */ 0)
@Mock private lateinit var mockViewState: TransitionViewState
@Mock private lateinit var mockCopiedState: TransitionViewState
@Mock private lateinit var mockWidgetState: WidgetState
@Before @Before
fun setUp() { fun setUp() {
@@ -63,4 +72,15 @@ class MediaViewControllerTest : SysuiTestCase() {
mediaHostStateHolder.squishFraction = 0.5f mediaHostStateHolder.squishFraction = 0.5f
assertTrue(mediaViewController.obtainViewState(mediaHostStateHolder)!!.height == 50) assertTrue(mediaViewController.obtainViewState(mediaHostStateHolder)!!.height == 50)
} }
@Test
fun testSquish_DoesNotMutateViewState() {
whenever(mockViewState.copy()).thenReturn(mockCopiedState)
whenever(mockCopiedState.widgetStates)
.thenReturn(mutableMapOf(R.id.album_art to mockWidgetState))
mediaViewController.squishViewState(mockViewState, 0.5f)
verify(mockViewState, times(1)).copy()
verifyNoMoreInteractions(mockViewState)
}
} }