Merge "Use sysuiResTag for qs edit mode components" into main (eabaa377) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.common.ui.compose.load
		import com.android.systemui.common.ui.icons.MoreVert
		import com.android.systemui.common.ui.icons.Undo
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.qs.flags.QsEditModeTabs
		import com.android.systemui.qs.panels.shared.model.SizedTileImpl
		import com.android.systemui.qs.panels.ui.compose.DragAndDropState
		@@ -796,7 +797,7 @@ private fun CurrentTilesGrid(
		alpha = .15f,
		)
		}
		.testTag(CURRENT_TILES_GRID_TEST_TAG),
		.sysuiResTag(CURRENT_TILES_GRID_TEST_TAG),
		) {
		EditTiles(
		listState = listState,
		@@ -908,7 +909,7 @@ private fun AvailableTileGrid(
		verticalArrangement = spacedBy(2.dp),
		horizontalAlignment = Alignment.Start,
		modifier =
		Modifier.fillMaxWidth().wrapContentHeight().testTag(AVAILABLE_TILES_GRID_TEST_TAG),
		Modifier.fillMaxWidth().wrapContentHeight().sysuiResTag(AVAILABLE_TILES_GRID_TEST_TAG),
		) {
		groupedTileSpecs.entries.forEachIndexed { index, (category, tileSpecs) ->
		key(category) {

+6 −4

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import androidx.compose.ui.unit.dp
		import androidx.compose.ui.window.PopupPositionProvider
		import com.android.systemui.Flags
		import com.android.systemui.common.ui.icons.Edit
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.qs.panels.ui.compose.toolbar.EditModeButtonDefaults.SpacingBetweenTooltipAndAnchor
		import com.android.systemui.qs.panels.ui.compose.toolbar.EditModeButtonDefaults.TooltipMaxWidth
		import com.android.systemui.qs.panels.ui.viewmodel.toolbar.EditModeButtonViewModel
		@@ -154,7 +155,8 @@ fun EditModeButton(
		onClick = viewModel::onButtonClick,
		shape = RoundedCornerShape(CornerSize(28.dp)),
		modifier =
		Modifier.borderOnFocus(
		Modifier.sysuiResTag("qs_edit_mode_button")
		.borderOnFocus(
		color = MaterialTheme.colorScheme.secondary,
		cornerSize = CornerSize(24.dp),
		),

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import com.android.compose.theme.PlatformTheme
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.compose.modifiers.resIdToTestTag
		import com.android.systemui.qs.flags.QsEditModeTabs
		import com.android.systemui.qs.panels.shared.model.SizedTileImpl
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.DefaultEditTileGrid
		@@ -232,8 +233,8 @@ class DragAndDropTest(flags: FlagsParameterization) : SysuiTestCase() {
		@JvmStatic
		fun data() = FlagsParameterization.progressionOf(QsEditModeTabs.FLAG_NAME)

		private const val CURRENT_TILES_GRID_TEST_TAG = "CurrentTilesGrid"
		private const val AVAILABLE_TILES_GRID_TEST_TAG = "AvailableTilesGrid"
		private val CURRENT_TILES_GRID_TEST_TAG = resIdToTestTag("CurrentTilesGrid")
		private val AVAILABLE_TILES_GRID_TEST_TAG = resIdToTestTag("AvailableTilesGrid")

		private fun createEditTile(
		tileSpec: String,

+3 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import com.android.compose.theme.PlatformTheme
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.compose.modifiers.resIdToTestTag
		import com.android.systemui.qs.flags.QsEditModeTabs
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.DefaultEditTileGrid
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditAction
		@@ -461,8 +462,8 @@ class EditModeTest : SysuiTestCase() {
		) = assertGridContainsExactly(AVAILABLE_TILES_GRID_TEST_TAG, specs)

		companion object {
		private const val CURRENT_TILES_GRID_TEST_TAG = "CurrentTilesGrid"
		private const val AVAILABLE_TILES_GRID_TEST_TAG = "AvailableTilesGrid"
		private val CURRENT_TILES_GRID_TEST_TAG = resIdToTestTag("CurrentTilesGrid")
		private val AVAILABLE_TILES_GRID_TEST_TAG = resIdToTestTag("AvailableTilesGrid")

		private fun createEditTile(
		tileSpec: String,

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import androidx.compose.ui.test.performTouchInput
		import androidx.test.filters.SmallTest
		import com.android.compose.theme.PlatformTheme
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.compose.modifiers.resIdToTestTag
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.flags.EnableSceneContainer
		import com.android.systemui.kosmos.Kosmos
		@@ -381,7 +382,7 @@ class InfiniteGridLayoutEditTileGridTest(flags: FlagsParameterization) : SysuiTe
		@JvmStatic
		fun data() = FlagsParameterization.progressionOf(QsEditModeTabs.FLAG_NAME)

		private const val AVAILABLE_TILES_GRID_TEST_TAG = "AvailableTilesGrid"
		private val AVAILABLE_TILES_GRID_TEST_TAG = resIdToTestTag("AvailableTilesGrid")
		private const val OPTIONS_DROP_DOWN_TEST_TAG = "OptionsDropdown"
		private val TestEditTiles =
		listOf(