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

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

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

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

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

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

@@ -94,11 +94,11 @@ public class SeekBarObserverTest : SysuiTestCase() {
 
     @Test
     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)
         observer.onChanged(data)
-        // THEN seek bar is visible
-        assertThat(seekBarView.progress).isEqualTo(100)
+        // THEN seek bar shows the progress
+        assertThat(seekBarView.progress).isEqualTo(3000)
         assertThat(seekBarView.max).isEqualTo(120000)
         assertThat(elapsedTimeView.getText()).isEqualTo("00:03")
         assertThat(totalTimeView.getText()).isEqualTo("02:00")