Merge "Fix group playback volume slider." into main (6c27a6b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -688,9 +688,11 @@ class MediaOutputAdapterTest : SysuiTestCase() {
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING)
		fun multipleSelectedDevices_listCollapsed_verifySessionControl() {
		mMediaSwitchingController.stub {
		on { isGroupListCollapsed } doReturn true
		// TODO: remove once FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING is cleaned up.
		on { isVolumeControlEnabledForSession } doReturn true
		}
		initializeSession()
		@@ -700,6 +702,7 @@ class MediaOutputAdapterTest : SysuiTestCase() {
		assertThat(mSlider.visibility).isEqualTo(VISIBLE)
		assertThat(mTitleText.visibility).isEqualTo(VISIBLE)
		assertThat(mSlider.value).isEqualTo(TEST_CURRENT_VOLUME)
		assertThat(mSlider.isEnabled).isTrue()
		}

		val viewHolder =

+1 −1

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ class MediaOutputAdapter(controller: MediaSwitchingController) :
		// casting devices without group volume control, so disabling seek bar will be
		// unnecessary when Flags.enableOutputSwitcherPersonalAudioSharing() is on.
		isVolumeControlAllowed =
		!Flags.enableOutputSwitcherPersonalAudioSharing() &&
		Flags.enableOutputSwitcherPersonalAudioSharing() \|\|
		mController.isVolumeControlEnabledForSession,
		currentVolume = mController.sessionVolume,
		maxVolume = mController.sessionVolumeMax,