Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dcfd82a authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Fix media landscape buttons and layout" into tm-qpr-dev am: 62097f8f 

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



Change-Id: I900d6655a1fa8a889f993beba5c36973d79bb7fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0594d0c3 62097f8f

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" />

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt

+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

        )

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt

+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