Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c43c9cd9 authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Add tests tags for QS edit mode 

This is required for e2e tests

Bug: 436832716
Flag: EXEMPT test only
Test: AddAndRemoveTiles
Test: ReorderTiles
Test: ResizeTiles

Change-Id: If5c11c4ab50c9946a73a43275da3140f8186590c
parent 5d42549e

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

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,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(
@@ -365,6 +367,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

 *

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

+13 −4
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import androidx.compose.foundation.layout.heightIn 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.requiredHeightIn

import androidx.compose.foundation.layout.requiredWidthIn

import androidx.compose.foundation.layout.safeContent

import androidx.compose.foundation.layout.safeDrawing

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.statusBarsPadding
@@ -416,7 +415,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()) {
@@ -1145,7 +1147,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()
@@ -1297,7 +1303,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 =
@@ -1511,6 +1518,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"

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

+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,

    )

}