Merge "Add ids to modes views" into main (fa6d0011) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogDelegate.kt

+13 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,11 @@ import android.provider.Settings
		import android.util.Log
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.semantics.testTagsAsResourceId
		import androidx.lifecycle.DefaultLifecycleObserver
		import androidx.lifecycle.LifecycleOwner
		import com.android.compose.PlatformButton
		@@ -88,7 +92,15 @@ constructor(
		@Composable
		private fun ModesDialogContent(dialog: SystemUIDialog) {
		AlertDialogContent(
		title = { Text(stringResource(R.string.zen_modes_dialog_title)) },
		modifier = Modifier.semantics {
		testTagsAsResourceId = true
		},
		title = {
		Text(
		modifier = Modifier.testTag("modes_title"),
		text = stringResource(R.string.zen_modes_dialog_title)
		)
		},
		content = { ModeTileGrid(viewModel.get()) },
		neutralButton = {
		PlatformOutlinedButton(onClick = { openSettings(dialog) }) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import androidx.compose.runtime.Composable
		import androidx.compose.runtime.CompositionLocalProvider
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.text.font.FontWeight
		import androidx.compose.ui.unit.dp
		import com.android.systemui.common.ui.compose.Icon
		@@ -70,12 +71,12 @@ fun ModeTile(viewModel: ModeTileViewModel) {
		Text(
		viewModel.text,
		fontWeight = FontWeight.W500,
		modifier = Modifier.tileMarquee()
		modifier = Modifier.tileMarquee().testTag("name")
		)
		Text(
		viewModel.subtext,
		fontWeight = FontWeight.W400,
		modifier = Modifier.tileMarquee()
		modifier = Modifier.tileMarquee().testTag("state")
		)
		}
		}