Merge "Always update mute icon along with slider value." into main (4c709a6d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.kt

+12 −4

Original line number	Diff line number	Diff line
		@@ -384,10 +384,19 @@ class MediaOutputAdapter(controller: MediaSwitchingController) :
		}
		}

		private fun initializeSeekbarVolume(currentVolume: Int) {
		private fun initializeSeekbarVolume(
		currentVolume: Int,
		deviceDrawable: Drawable?,
		muteDrawable: Drawable?,
		) {
		tryResolveVolumeUserRequest(currentVolume)
		if (!isDragging && hasNoPendingVolumeRequests()) {
		mSlider.value = currentVolume.toFloat()
		updateSliderIconsVisibility(
		deviceDrawable = deviceDrawable,
		muteDrawable = muteDrawable,
		isMuted = currentVolume == 0,
		)
		}
		}

		@@ -432,12 +441,11 @@ class MediaOutputAdapter(controller: MediaSwitchingController) :
		mSlider.trackIconInactiveColor =
		ColorStateList.valueOf(colorTheme.sliderInactiveIconColor)
		val muteDrawable = getMuteDrawable(isInputDevice)
		updateSliderIconsVisibility(
		initializeSeekbarVolume(
		currentVolume = currentVolume,
		deviceDrawable = deviceDrawable,
		muteDrawable = muteDrawable,
		isMuted = currentVolume == 0,
		)
		initializeSeekbarVolume(currentVolume)

		mSlider.clearOnChangeListeners() // Prevent adding multiple listeners
		mSlider.addOnChangeListener { _: Slider, value: Float, fromUser: Boolean ->