Merge "Handle all BundleHeader interactions via ExpandableNotificationRow" into main (c5f93c94) · Commits · e / os / android_frameworks_base

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

+6 −42

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import androidx.compose.animation.core.FastOutSlowInEasing
		import androidx.compose.animation.core.LinearEasing
		import androidx.compose.animation.core.tween
		import androidx.compose.foundation.Image
		import androidx.compose.foundation.combinedClickable
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.fillMaxSize
		@@ -44,11 +43,8 @@ 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.clearAndSetSemantics
		import androidx.compose.ui.semantics.contentDescription
		import androidx.compose.ui.semantics.dismiss
		import androidx.compose.ui.semantics.expand
		import androidx.compose.ui.semantics.onLongClick
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.text.style.TextOverflow
		import androidx.compose.ui.unit.Dp
		@@ -87,12 +83,7 @@ object BundleHeader {

		@OptIn(ExperimentalMaterial3ExpressiveApi::class)
		@Composable
		fun BundleHeader(
		viewModel: BundleHeaderViewModel,
		modifier: Modifier = Modifier,
		onHeaderClicked: () -> Unit = {},
		onA11yDismissAction: () -> Unit = {}, // only for dismissing via accessibility action
		) {
		fun BundleHeader(viewModel: BundleHeaderViewModel, modifier: Modifier = Modifier) {
		val state =
		rememberMutableSceneTransitionLayoutState(
		initialScene = BundleHeader.Scenes.Collapsed,
		@@ -142,39 +133,12 @@ fun BundleHeader(

		Box(modifier) {
		Background(background = viewModel.backgroundDrawable, modifier = Modifier.matchParentSize())
		fun toggle() {
		viewModel.onHeaderClicked()
		onHeaderClicked()
		}
		SceneTransitionLayout(
		state = state,
		modifier =
		Modifier.combinedClickable(
		onClick = { toggle() },
		interactionSource = null,
		indication = null,
		)
		.semantics {
		when (state.currentScene) {
		BundleHeader.Scenes.Collapsed ->
		expand {
		toggle()
		true
		}
		BundleHeader.Scenes.Expanded ->
		collapse {
		toggle()
		true
		}
		}
		dismiss {
		onA11yDismissAction()
		true
		}
		// Do nothing. This is here to indicate that the BundleHeader is long
		// clickable; the actual long click is handled by ExpandableNotificationRow.
		onLongClick(action = null)
		},
		// The BundleHeader is clickable, but clicks are handled at the level of the
		// ExpandableNotificationRow. We clear all semantics here so that accessibility focus
		// remains on the same element as handles the clicks and actions.
		modifier = Modifier.clearAndSetSemantics {},
		) {
		scene(BundleHeader.Scenes.Collapsed) {
		BundleHeaderContent(viewModel, collapsed = true)

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2209,6 +2209,9 @@
		other {# notifications}
		}</string>

		<!-- Template for making a content description of a notification bundle header, combining the bundle name (e.g. "News") with the number of notifications in it. -->
		<string name="notification_bundle_header_joined_description"><xliff:g id="name" example="Promotions">%1$s</xliff:g>, <xliff:g id="num_notifications" example="2 notifications">%2$s</xliff:g></string>

		<!-- Notification Inline controls: button to dismiss the blocking helper [CHAR_LIMIT=20] -->
		<string name="inline_done_button">Done</string>

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -205,14 +205,16 @@ private fun HeaderComposeViewContent(
		)
		DisposableEffect(viewModel) {
		row.setBundleHeaderViewModel(viewModel)
		onDispose { row.setBundleHeaderViewModel(null) }
		row.setOnClickListener {
		viewModel.onHeaderClicked()
		row.expandNotification()
		}
		BundleHeader(
		viewModel,
		onHeaderClicked = { row.expandNotification() },
		// to be used only for dismissal coming from an accessibility action.
		onA11yDismissAction = { row.performDismiss(true) },
		)
		onDispose {
		row.setOnClickListener(null)
		row.setBundleHeaderViewModel(null)
		}
		}
		BundleHeader(viewModel)
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -4377,6 +4377,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		info.addAction(action);
		}
		}

		if (isBundle()) {
		// Set a content description explicitly for the bundle header because we can't
		// otherwise merge accessibility information across the ViewGroup/ComposeView boundary.
		NotificationChildrenContainer childrenContainer = getChildrenContainerNonNull();
		info.setContentDescription(childrenContainer.getBundleHeaderDescription());
		}
		}

		/** @return whether this row's expansion state can be toggled by an accessibility action. */

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/domain/interactor/BundleInteractor.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,14 @@ constructor(
		numberOfChildren ?: 0,
		)

		val headerContentDescription: String
		get() =
		context.resources.getString(
		R.string.notification_bundle_header_joined_description,
		context.resources.getString(titleText),
		numberOfChildrenContentDescription,
		)

		private var sceneTargetJob: Job? = null

		init {