Merge "Handle invalid values in ResizeableItemFrameViewModel" into main (1d3c72ef) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/ResizeableItemFrameViewModelTest.kt

+33 −0

Original line number	Diff line number	Diff line
		@@ -366,6 +366,39 @@ class ResizeableItemFrameViewModelTest : SysuiTestCase() {
		assertThat(bottomState.anchors.toList()).containsExactly(0 to 0f)
		}

		@Test
		fun testMaxSpansLessThanCurrentSpan() =
		testScope.runTest {
		// heightPerSpan =
		// (viewportHeightPx - verticalContentPaddingPx - (totalSpans - 1)
		// * verticalItemSpacingPx) / totalSpans
		// = 145.3333
		// maxSpans = (maxHeightPx + verticalItemSpacing) /
		// (heightPerSpanPx + verticalItemSpacingPx)
		// = 4.72
		// This is invalid because the max span calculation comes out to be less than
		// the current span. Ensure we handle this case correctly.
		val layout =
		GridLayout(
		verticalItemSpacingPx = 100f,
		currentRow = 0,
		minHeightPx = 480,
		maxHeightPx = 1060,
		currentSpan = 6,
		resizeMultiple = 3,
		totalSpans = 6,
		viewportHeightPx = 1600,
		verticalContentPaddingPx = 228f,
		)
		updateGridLayout(layout)

		val topState = underTest.topDragState
		val bottomState = underTest.bottomDragState

		assertThat(topState.anchors.toList()).containsExactly(0 to 0f)
		assertThat(bottomState.anchors.toList()).containsExactly(0 to 0f, -3 to -736f)
		}

		@Test
		fun testCanExpand_atTopPosition_withMultipleAnchors_returnsTrue() =
		testScope.runTest {

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,10 +76,10 @@ class ResizeableItemFrameViewModel : ExclusiveActivatable() {
		floor(spans.toDouble() / resizeMultiple).toInt() * resizeMultiple

		val maxSpans: Int
		get() = roundDownToMultiple(getSpansForPx(maxHeightPx))
		get() = roundDownToMultiple(getSpansForPx(maxHeightPx)).coerceAtLeast(currentSpan)

		val minSpans: Int
		get() = roundDownToMultiple(getSpansForPx(minHeightPx))
		get() = roundDownToMultiple(getSpansForPx(minHeightPx)).coerceAtMost(currentSpan)
		}

		/** Check if widget can expanded based on current drag states */