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 am: b4a4c3b3a0

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

Change-Id: I8c02b1aa26ade28b21f052385a299850a0abbbdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2022-06-02 22:15:29 +00:00
committed by Automerger Merge Worker
parent a67ec6140e b4a4c3b3a0
commit 151fb0ebf7
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)
val totalTimeString = DateUtils.formatElapsedTime(
data.duration / DateUtils.SECOND_IN_MILLIS)
holder.scrubbingTotalTimeView.text = totalTimeString
if (data.scrubbing) {
holder.scrubbingTotalTimeView.text = totalTimeString
}
data.elapsedTime?.let {
if (!data.scrubbing && !(seekBarResetAnimator?.isRunning ?: false)) {
@@ -113,9 +115,12 @@ open class SeekBarObserver(
holder.seekBar.progress = it
}
}
val elapsedTimeString = DateUtils.formatElapsedTime(
it / DateUtils.SECOND_IN_MILLIS)
holder.scrubbingElapsedTimeView.text = elapsedTimeString
if (data.scrubbing) {
holder.scrubbingElapsedTimeView.text = elapsedTimeString
}
holder.seekBar.contentDescription = holder.seekBar.context.getString(
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
fun seekBarProgress_enabled_timeViewsHaveTime() {
val data = SeekBarViewModel.Progress(enabled = true, true, true, false, 3000, 120000)
fun seekBarProgress_enabledAndScrubbing_timeViewsHaveTime() {
val isEnabled = true
val isScrubbing = true
val data = SeekBarViewModel.Progress(isEnabled, true, true, isScrubbing, 3000, 120000)
observer.onChanged(data)
@@ -188,8 +190,22 @@ class SeekBarObserverTest : SysuiTestCase() {
}
@Test
fun seekBarProgress_disabled_timeViewsEmpty() {
val data = SeekBarViewModel.Progress(enabled = false, true, true, false, 3000, 120000)
fun seekBarProgress_disabledAndScrubbing_timeViewsEmpty() {
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)