Merge "Add tests tags for QS edit mode" into main (47fea8e9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,8 @@ import platform.test.motion.compose.values.MotionTestValueKey
		import platform.test.motion.compose.values.motionTestValues

		private const val TEST_TAG_TOGGLE = "qs_tile_toggle_target"
		private const val TEST_TAG_SMALL = "qs_tile_small"
		private const val TEST_TAG_LARGE = "qs_tile_large"

		@Composable
		fun LargeTileContent(
		@@ -363,6 +365,10 @@ private fun TileLabel(
		)
		}

		fun Modifier.tileTestTag(iconOnly: Boolean): Modifier {
		return sysuiResTag(if (iconOnly) TEST_TAG_SMALL else TEST_TAG_LARGE)
		}

		/**
		* Apply the correct padding for large tiles
		*

+13 −3

Original line number	Diff line number	Diff line
		@@ -418,7 +418,10 @@ fun DefaultEditTileGrid(
		}

		Scaffold(
		modifier = modifier.consumeWindowInsets(WindowInsets.displayCutout),
		modifier =
		modifier
		.consumeWindowInsets(WindowInsets.displayCutout)
		.sysuiResTag(EDIT_MODE_ROOT_TEST_TAG),
		containerColor = Color.Transparent,
		topBar = {
		EditModeTopBar(onStopEditing = onStopEditing, modifier = Modifier.statusBarsPadding()) {
		@@ -1147,7 +1150,11 @@ private fun LazyGridItemScope.TileGridCell(
		tileState = tileState,
		resizingState = resizingState,
		modifier =
		modifier.height(TileHeight).fillMaxWidth().animateItem(placementSpec = placementSpec),
		modifier
		.height(TileHeight)
		.fillMaxWidth()
		.animateItem(placementSpec = placementSpec)
		.tileTestTag(cell.isIcon),
		onClick = {
		if (tileState == TileState.Removable) {
		removeTile()
		@@ -1304,7 +1311,8 @@ private fun AvailableTileGridCell(
		// meaningful when on screen), and it will be skipped when not visible.
		this.role = Role.Button
		}
		},
		}
		.sysuiResTag(AVAILABLE_TILE_TEST_TAG),
		) {
		Box(Modifier.fillMaxWidth().height(TileHeight)) {
		val draggableModifier =
		@@ -1523,6 +1531,8 @@ private object EditModeTileDefaults {
		)
		}

		private const val EDIT_MODE_ROOT_TEST_TAG = "EditModeRoot"
		private const val CURRENT_TILES_GRID_TEST_TAG = "CurrentTilesGrid"
		private const val AVAILABLE_TILES_GRID_TEST_TAG = "AvailableTilesGrid"
		private const val OPTIONS_DROP_DOWN_TEST_TAG = "OptionsDropdown"
		private const val AVAILABLE_TILE_TEST_TAG = "AvailableTileTestTag"

+1 −5

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ import com.android.mechanics.spec.builder.rememberMotionBuilderContext
		import com.android.systemui.Flags
		import com.android.systemui.animation.Expandable
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.haptics.msdl.qs.TileHapticsViewModel
		import com.android.systemui.haptics.msdl.qs.TileHapticsViewModelFactoryProvider
		import com.android.systemui.lifecycle.rememberViewModel
		@@ -111,9 +110,6 @@ import com.android.systemui.qs.ui.compose.borderOnFocus
		import com.android.systemui.res.R
		import kotlinx.coroutines.CoroutineScope

		private const val TEST_TAG_SMALL = "qs_tile_small"
		private const val TEST_TAG_LARGE = "qs_tile_large"

		@Composable
		fun TileLazyGrid(
		columns: GridCells,
		@@ -401,7 +397,7 @@ fun TileContainer(
		isDualTarget = isDualTarget,
		interactionSource = interactionSource,
		)
		.sysuiResTag(if (iconOnly) TEST_TAG_SMALL else TEST_TAG_LARGE),
		.tileTestTag(iconOnly),
		content = content,
		)
		}