Merge "[OutputSwitcher] Allow open output switcher in PAS with flag guarded" into main (da67d1b9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.util.Log
		import androidx.annotation.AnyThread
		import androidx.annotation.MainThread
		import androidx.annotation.WorkerThread
		import com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing
		import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast
		import com.android.settingslib.bluetooth.LocalBluetoothManager
		import com.android.settingslib.flags.Flags.enableLeAudioSharing
		@@ -446,10 +447,12 @@ constructor(
		private fun getLeAudioBroadcastDeviceData(): MediaDeviceData {
		return if (enableLeAudioSharing()) {
		MediaDeviceData(
		enabled = false,
		enabled = enableOutputSwitcherPersonalAudioSharing(),
		icon = MediaControlDrawables.getLeAudioSharing(context),
		name = context.getString(R.string.audio_sharing_description),
		intent = null,
		// TODO(b/333324985): showBroadcastButton is legacy audio sharing flow, remove
		// these code once new design is launched.
		showBroadcastButton = false,
		)
		} else {

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt

+45 −4

Original line number	Diff line number	Diff line
		@@ -799,9 +799,8 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING, Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
		fun onBroadcastStarted_flagOff_currentMediaDeviceDataIsBroadcasting() {
		mSetFlagsRule.disableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
		val broadcastCallback = setupBroadcastCallback()
		setupLeAudioConfiguration(true)
		setupBroadcastPackage(BROADCAST_APP_NAME)
		@@ -857,7 +856,10 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@DisableFlags(
		Flags.FLAG_LEGACY_LE_AUDIO_SHARING,
		com.android.media.flags.Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING,
		)
		@EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
		fun onBroadcastStarted_currentMediaDeviceDataIsBroadcasting() {
		val broadcastCallback = setupBroadcastCallback()
		@@ -871,6 +873,24 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas
		assertThat(data.name).isEqualTo(context.getString(R.string.audio_sharing_description))
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@EnableFlags(
		Flags.FLAG_ENABLE_LE_AUDIO_SHARING,
		com.android.media.flags.Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING,
		)
		fun onBroadcastStarted_outputSwitcherIntegrated_currentMediaDeviceDataIsBroadcasting() {
		val broadcastCallback = setupBroadcastCallback()
		setupLeAudioConfiguration(true)
		setupBroadcastPackage(BROADCAST_APP_NAME)
		broadcastCallback.onBroadcastStarted(1, 1)

		val data = loadMediaAndCaptureDeviceData()
		assertThat(data.showBroadcastButton).isFalse()
		assertThat(data.enabled).isTrue()
		assertThat(data.name).isEqualTo(context.getString(R.string.audio_sharing_description))
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@EnableFlags(
		@@ -948,7 +968,10 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@DisableFlags(
		Flags.FLAG_LEGACY_LE_AUDIO_SHARING,
		com.android.media.flags.Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING,
		)
		@EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
		fun onBroadcastStarted_currentMediaDeviceDataIsNotBroadcasting() {
		val broadcastCallback = setupBroadcastCallback()
		@@ -962,6 +985,24 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas
		assertThat(data.name).isEqualTo(context.getString(R.string.audio_sharing_description))
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@EnableFlags(
		Flags.FLAG_ENABLE_LE_AUDIO_SHARING,
		com.android.media.flags.Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING,
		)
		fun onBroadcastStarted_outputSwitcherIntegrated_currentMediaDeviceDataIsNotBroadcasting() {
		val broadcastCallback = setupBroadcastCallback()
		setupLeAudioConfiguration(true)
		setupBroadcastPackage(NORMAL_APP_NAME)
		broadcastCallback.onBroadcastStarted(1, 1)

		val data = loadMediaAndCaptureDeviceData()
		assertThat(data.showBroadcastButton).isFalse()
		assertThat(data.enabled).isTrue()
		assertThat(data.name).isEqualTo(context.getString(R.string.audio_sharing_description))
		}

		@Test
		@DisableFlags(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)
		@EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)