Merge "[SB] Add res tag to the chip content so we can find it in e2e tests." into main (51bcbd27) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChip.kt

+9 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import com.android.compose.modifiers.thenIf
		import com.android.systemui.animation.Expandable
		import com.android.systemui.common.ui.compose.Icon
		import com.android.systemui.common.ui.compose.load
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.StatusBarIconView
		import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations
		@@ -191,7 +192,12 @@ private fun ChipBody(

		val isIconOnly = model.content is OngoingActivityChipModel.Content.IconOnly
		if (!isIconOnly) {
		ChipContent(viewModel = model.content, icon = model.icon, colors = model.colors)
		ChipContent(
		viewModel = model.content,
		icon = model.icon,
		colors = model.colors,
		modifier = Modifier.sysuiResTag(STATUS_BAR_CHIP_CONTENT_ID),
		)
		}
		}
		}
		@@ -279,4 +285,6 @@ private fun StatusBarIcon(
		}

		private const val TAG = "OngoingActivityChip"
		// Used for end-to-end tests - if changing this, be sure to change the status bar e2e tests also.
		private const val STATUS_BAR_CHIP_CONTENT_ID = "ongoing_activity_chip_content"
		@IdRes private val CUSTOM_ICON_VIEW_ID = R.id.ongoing_activity_chip_custom_icon