Merge "Flexiglass: Fix QSHeader scenario tests" into main (6cc72391) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+5 −3

Original line number	Diff line number	Diff line
		@@ -147,6 +147,8 @@ object ShadeHeader {

		object TestTags {
		const val Root = "shade_header_root"
		const val BatteryTestTag = "battery_meter_composable_view"
		const val BatteryTestTagLegacy = "battery_percentage_view"
		}

		/** Represents the background highlighting of a header icons chip. */
		@@ -196,7 +198,7 @@ fun ContentScope.CollapsedShadeHeader(

		// This layout assumes it is globally positioned at (0, 0) and is the same size as the screen.
		CutoutAwareShadeHeader(
		modifier = modifier,
		modifier = modifier.sysuiResTag(ShadeHeader.TestTags.Root),
		startContent = {
		Row(
		verticalAlignment = Alignment.CenterVertically,
		@@ -564,13 +566,13 @@ private fun BatteryInfo(
		showIcon = showIcon,
		showEstimate = useExpandedFormat,
		textColor = textColor,
		modifier = modifier,
		modifier = modifier.sysuiResTag(ShadeHeader.TestTags.BatteryTestTag),
		)
		} else {
		BatteryIconLegacy(
		createBatteryMeterViewController = viewModel.createBatteryMeterViewController,
		useExpandedFormat = useExpandedFormat,
		modifier = modifier,
		modifier = modifier.sysuiResTag(ShadeHeader.TestTags.BatteryTestTagLegacy),
		isHighlighted = isHighlighted,
		)
		}