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

Merge "Fix media landscape buttons and layout" into tm-qpr-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2023-02-10 18:21:04 +00:00
committed by Android (Google) Code Review
parent f8d2447f60 7cdd0352c8
commit 62097f8f83
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/xml/media_session_collapsed.xml
View File

@@ -73,11 +73,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/qs_media_info_spacing" android:layout_marginEnd="@dimen/qs_media_info_spacing"
android:layout_marginBottom="@dimen/qs_media_padding" 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_constraintStart_toStartOf="@id/header_title"
app:layout_constraintEnd_toStartOf="@id/header_artist" app:layout_constraintEnd_toStartOf="@id/header_artist"
app:layout_constraintTop_toTopOf="@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_bias="0"
app:layout_constraintHorizontal_chainStyle="packed" /> app:layout_constraintHorizontal_chainStyle="packed" />

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

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

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

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