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

Commit 151fb0eb authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I8c02b1aa26ade28b21f052385a299850a0abbbdf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a67ec614 b4a4c3b3

packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt

+7 −2
Original line number Original line Diff line number Diff line
@@ -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)

        if (data.scrubbing) {

            holder.scrubbingTotalTimeView.text = totalTimeString

            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)

            if (data.scrubbing) {

                holder.scrubbingElapsedTimeView.text = elapsedTimeString

                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,

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

+20 −4
Original line number Original line Diff line number Diff line
@@ -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)