diff options
3 files changed, 13 insertions, 14 deletions
diff --git a/packages/SystemUI/res/xml/media_session_collapsed.xml b/packages/SystemUI/res/xml/media_session_collapsed.xml index d9c81af54a12..5129fc0337e0 100644 --- a/packages/SystemUI/res/xml/media_session_collapsed.xml +++ b/packages/SystemUI/res/xml/media_session_collapsed.xml @@ -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" /> diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt index 1e6002cdc717..b9b0459ad615 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt @@ -311,16 +311,15 @@ constructor( } // media player - val controlsTop = - calculateWidgetGroupAlphaForSquishiness( - controlIds, - squishedViewState.measureHeight.toFloat(), - squishedViewState, - squishFraction - ) + calculateWidgetGroupAlphaForSquishiness( + controlIds, + squishedViewState.measureHeight.toFloat(), + squishedViewState, + squishFraction + ) calculateWidgetGroupAlphaForSquishiness( detailIds, - controlsTop, + squishedViewState.measureHeight.toFloat(), squishedViewState, squishFraction ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt index 2f7eac2ad4ae..af91cdb1522c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt @@ -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 |