Merge "Fix media landscape buttons and layout" into tm-qpr-dev (62097f8f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/xml/media_session_collapsed.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -73,11 +73,12 @@
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/qs_media_info_spacing"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginTop="0dp"
		android:layout_marginTop="@dimen/qs_media_icon_offset"
		app:layout_constraintStart_toStartOf="@id/header_title"
		app:layout_constraintEnd_toStartOf="@id/header_artist"
		app:layout_constraintTop_toTopOf="@id/header_artist"
		app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"
		app:layout_constraintBottom_toBottomOf="@id/header_artist"
		app:layout_constraintVertical_bias="0"
		app:layout_constraintHorizontal_bias="0"
		app:layout_constraintHorizontal_chainStyle="packed" />

+7 −8

Original line number	Diff line number	Diff line
		@@ -311,7 +311,6 @@ constructor(
		}

		// media player
		val controlsTop =
		calculateWidgetGroupAlphaForSquishiness(
		controlIds,
		squishedViewState.measureHeight.toFloat(),
		@@ -320,7 +319,7 @@ constructor(
		)
		calculateWidgetGroupAlphaForSquishiness(
		detailIds,
		controlsTop,
		squishedViewState.measureHeight.toFloat(),
		squishedViewState,
		squishFraction
		)

+3 −4

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.floatThat
		import org.mockito.Mock
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.Mockito.`when` as whenever
		import org.mockito.MockitoAnnotations
		@@ -139,14 +140,12 @@ class MediaViewControllerTest : SysuiTestCase() {
		whenever(controlWidgetState.y).thenReturn(150F)
		whenever(controlWidgetState.height).thenReturn(20)
		// in current beizer, when the progress reach 0.38, the result will be 0.5
		mediaViewController.squishViewState(mockViewState, 119F / 200F)
		verify(detailWidgetState).alpha = floatThat { kotlin.math.abs(it - 0.5F) < delta }
		mediaViewController.squishViewState(mockViewState, 150F / 200F)
		verify(detailWidgetState).alpha = floatThat { kotlin.math.abs(it - 1.0F) < delta }
		mediaViewController.squishViewState(mockViewState, 181.4F / 200F)
		verify(controlWidgetState).alpha = floatThat { kotlin.math.abs(it - 0.5F) < delta }
		verify(detailWidgetState).alpha = floatThat { kotlin.math.abs(it - 1.0F) < delta }
		mediaViewController.squishViewState(mockViewState, 200F / 200F)
		verify(controlWidgetState).alpha = floatThat { kotlin.math.abs(it - 1.0F) < delta }
		verify(detailWidgetState, times(2)).alpha = floatThat { kotlin.math.abs(it - 1.0F) < delta }
		}

		@Test