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

Merge "Prevent updating of seekbar text when not scrubbing." into tm-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-06-02 21:57:53 +00:00
committed by Android (Google) Code Review
parent dc2426af92 1c07d1231b
commit b4a4c3b3a0
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,9 @@ open class SeekBarObserver(
holder.seekBar.setMax(data.duration) holder.seekBar.setMax(data.duration)
val totalTimeString = DateUtils.formatElapsedTime( val totalTimeString = DateUtils.formatElapsedTime(
data.duration / DateUtils.SECOND_IN_MILLIS) data.duration / DateUtils.SECOND_IN_MILLIS)
holder.scrubbingTotalTimeView.text = totalTimeString if (data.scrubbing) {
holder.scrubbingTotalTimeView.text = totalTimeString
}
data.elapsedTime?.let { data.elapsedTime?.let {
if (!data.scrubbing && !(seekBarResetAnimator?.isRunning ?: false)) { if (!data.scrubbing && !(seekBarResetAnimator?.isRunning ?: false)) {
@@ -113,9 +115,12 @@ open class SeekBarObserver(
holder.seekBar.progress = it holder.seekBar.progress = it
} }
} }
val elapsedTimeString = DateUtils.formatElapsedTime( val elapsedTimeString = DateUtils.formatElapsedTime(
it / DateUtils.SECOND_IN_MILLIS) it / DateUtils.SECOND_IN_MILLIS)
holder.scrubbingElapsedTimeView.text = elapsedTimeString if (data.scrubbing) {
holder.scrubbingElapsedTimeView.text = elapsedTimeString
}
holder.seekBar.contentDescription = holder.seekBar.context.getString( holder.seekBar.contentDescription = holder.seekBar.context.getString(
R.string.controls_media_seekbar_description, R.string.controls_media_seekbar_description,

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

@@ -178,8 +178,10 @@ class SeekBarObserverTest : SysuiTestCase() {
} }
@Test @Test
fun seekBarProgress_enabled_timeViewsHaveTime() { fun seekBarProgress_enabledAndScrubbing_timeViewsHaveTime() {
val data = SeekBarViewModel.Progress(enabled = true, true, true, false, 3000, 120000) val isEnabled = true
val isScrubbing = true
val data = SeekBarViewModel.Progress(isEnabled, true, true, isScrubbing, 3000, 120000)
observer.onChanged(data) observer.onChanged(data)
@@ -188,8 +190,22 @@ class SeekBarObserverTest : SysuiTestCase() {
} }
@Test @Test
fun seekBarProgress_disabled_timeViewsEmpty() { fun seekBarProgress_disabledAndScrubbing_timeViewsEmpty() {
val data = SeekBarViewModel.Progress(enabled = false, true, true, false, 3000, 120000) val isEnabled = false
val isScrubbing = true
val data = SeekBarViewModel.Progress(isEnabled, true, true, isScrubbing, 3000, 120000)
observer.onChanged(data)
assertThat(scrubbingElapsedTimeView.text).isEqualTo("")
assertThat(scrubbingTotalTimeView.text).isEqualTo("")
}
@Test
fun seekBarProgress_enabledAndNotScrubbing_timeViewsEmpty() {
val isEnabled = true
val isScrubbing = false
val data = SeekBarViewModel.Progress(isEnabled, true, true, isScrubbing, 3000, 120000)
observer.onChanged(data) observer.onChanged(data)