Merge "Add semantics actions to BundleHeader." into main (198e7c40) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/BundleHeader.kt

+31 −7

Original line number	Diff line number	Diff line
		@@ -45,6 +45,10 @@ import androidx.compose.ui.layout.ContentScale
		import androidx.compose.ui.layout.Layout
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.semantics.collapse
		import androidx.compose.ui.semantics.dismiss
		import androidx.compose.ui.semantics.expand
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.text.style.TextOverflow
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.constrainHeight
		@@ -87,6 +91,7 @@ fun BundleHeader(
		modifier: Modifier = Modifier,
		onHeaderClicked: () -> Unit = {},
		onHeaderLongClicked: () -> Unit = {},
		onA11yDismissAction: () -> Unit = {}, // only for dismissing via accessibility action
		) {
		val state =
		rememberMutableSceneTransitionLayoutState(
		@@ -137,18 +142,37 @@ fun BundleHeader(

		Box(modifier) {
		Background(background = viewModel.backgroundDrawable, modifier = Modifier.matchParentSize())
		fun toggle() {
		viewModel.onHeaderClicked()
		onHeaderClicked()
		}
		SceneTransitionLayout(
		state = state,
		modifier =
		Modifier.combinedClickable(
		onClick = {
		viewModel.onHeaderClicked()
		onHeaderClicked()
		},
		onClick = { toggle() },
		onLongClick = { onHeaderLongClicked() },
		interactionSource = null,
		indication = null,
		),
		)
		.semantics {
		when (state.currentScene) {
		BundleHeader.Scenes.Collapsed ->
		expand {
		toggle()
		true
		}
		BundleHeader.Scenes.Expanded ->
		collapse {
		toggle()
		true
		}
		}
		dismiss {
		onA11yDismissAction()
		true
		}
		},
		) {
		scene(BundleHeader.Scenes.Collapsed) {
		BundleHeaderContent(viewModel, collapsed = true)

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/BundleBarn.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,8 @@ private fun HeaderComposeViewContent(
		viewModel,
		onHeaderClicked = { row.expandNotification() },
		onHeaderLongClicked = { row.performLongClick() },
		// to be used only for dismissal coming from an accessibility action.
		onA11yDismissAction = { row.performDismiss(true) },
		)
		}
		}