Merge "Fix Media Output a11y click action" into main (ad25084d) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/mediaoutput/ui/composable/MediaOutputComponent.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,10 @@ constructor(
		modifier =
		Modifier.fillMaxWidth().height(80.dp).semantics {
		liveRegion = LiveRegionMode.Polite
		this.onClick(label = clickLabel) { false }
		this.onClick(label = clickLabel) {
		viewModel.onBarClick(null)
		true
		}
		},
		color = MaterialTheme.colorScheme.surface,
		shape = RoundedCornerShape(28.dp),

+3 −3

Original line number	Diff line number	Diff line
		@@ -33,15 +33,15 @@ constructor(
		private val mediaOutputDialogManager: MediaOutputDialogManager,
		) {

		fun onBarClick(sessionWithPlaybackState: SessionWithPlaybackState?, expandable: Expandable) {
		fun onBarClick(sessionWithPlaybackState: SessionWithPlaybackState?, expandable: Expandable?) {
		if (sessionWithPlaybackState?.isPlaybackActive == true) {
		mediaOutputDialogManager.createAndShowWithController(
		sessionWithPlaybackState.session.packageName,
		false,
		expandable.dialogController()
		expandable?.dialogController()
		)
		} else {
		mediaOutputDialogManager.createAndShowForSystemRouting(expandable.dialogController())
		mediaOutputDialogManager.createAndShowForSystemRouting(expandable?.dialogController())
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ constructor(
		null,
		)

		fun onBarClick(expandable: Expandable) {
		fun onBarClick(expandable: Expandable?) {
		uiEventLogger.log(VolumePanelUiEvent.VOLUME_PANEL_MEDIA_OUTPUT_CLICKED)
		val result = sessionWithPlaybackState.value
		actionsInteractor.onBarClick((result as? Result.Data)?.data, expandable)