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

Merge "Recreate media controls when style changes" into rvc-qpr-dev

Browse Source
This commit is contained in:
Robert Snoeberger
2020-07-31 16:56:32 +00:00
committed by Android (Google) Code Review
parent 9205f447b5 d50f065d77
commit 36083cf877
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
View File

@@ -135,6 +135,7 @@ class MediaCarouselController @Inject constructor(
} }
override fun onOverlayChanged() { override fun onOverlayChanged() {
recreatePlayers()
inflateSettingsButton() inflateSettingsButton()
} }

12
packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt
View File

@@ -55,16 +55,16 @@ class SeekBarObserver(private val holder: PlayerViewHolder) : Observer<SeekBarVi
holder.seekBar.maxHeight = seekBarDefaultMaxHeight holder.seekBar.maxHeight = seekBarDefaultMaxHeight
} }
data.elapsedTime?.let {
holder.seekBar.setProgress(it)
holder.elapsedTimeView.setText(DateUtils.formatElapsedTime(
it / DateUtils.SECOND_IN_MILLIS))
}
data.duration?.let { data.duration?.let {
holder.seekBar.setMax(it) holder.seekBar.setMax(it)
holder.totalTimeView.setText(DateUtils.formatElapsedTime( holder.totalTimeView.setText(DateUtils.formatElapsedTime(
it / DateUtils.SECOND_IN_MILLIS)) it / DateUtils.SECOND_IN_MILLIS))
} }
data.elapsedTime?.let {
holder.seekBar.setProgress(it)
holder.elapsedTimeView.setText(DateUtils.formatElapsedTime(
it / DateUtils.SECOND_IN_MILLIS))
}
} }
} }

6
packages/SystemUI/tests/src/com/android/systemui/media/SeekBarObserverTest.kt
View File

@@ -94,11 +94,11 @@ public class SeekBarObserverTest : SysuiTestCase() {
@Test @Test
fun seekBarProgress() { fun seekBarProgress() {
// WHEN seek bar progress is about half // WHEN part of the track has been played
val data = SeekBarViewModel.Progress(true, true, 3000, 120000) val data = SeekBarViewModel.Progress(true, true, 3000, 120000)
observer.onChanged(data) observer.onChanged(data)
// THEN seek bar is visible // THEN seek bar shows the progress
assertThat(seekBarView.progress).isEqualTo(100) assertThat(seekBarView.progress).isEqualTo(3000)
assertThat(seekBarView.max).isEqualTo(120000) assertThat(seekBarView.max).isEqualTo(120000)
assertThat(elapsedTimeView.getText()).isEqualTo("00:03") assertThat(elapsedTimeView.getText()).isEqualTo("00:03")
assertThat(totalTimeView.getText()).isEqualTo("02:00") assertThat(totalTimeView.getText()).isEqualTo("02:00")