Merge "(Officially) make Modes dialog one-mode-per-row" into main (8b15ee5a) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -148,16 +148,6 @@ flag {
		}
		}

		flag {
		name: "modes_dialog_single_rows"
		namespace: "systemui"
		description: "[Experiment] Display one entry per grid row in the Modes Dialog."
		bug: "366034002"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "pss_app_selector_recents_split_screen"
		namespace: "systemui"

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ fun ModeTile(viewModel: ModeTileViewModel) {
		.semantics { stateDescription = viewModel.stateDescription },
		verticalAlignment = Alignment.CenterVertically,
		horizontalArrangement =
		Arrangement.spacedBy(space = 8.dp, alignment = Alignment.Start),
		Arrangement.spacedBy(space = 12.dp, alignment = Alignment.Start),
		) {
		Icon(icon = viewModel.icon, modifier = Modifier.size(24.dp))
		Column {

+2 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.systemui.Flags
		import com.android.systemui.statusbar.policy.ui.dialog.viewmodel.ModesDialogViewModel

		@Composable
		@@ -34,8 +33,8 @@ fun ModeTileGrid(viewModel: ModesDialogViewModel) {
		val tiles by viewModel.tiles.collectAsStateWithLifecycle(initialValue = emptyList())

		LazyVerticalGrid(
		columns = GridCells.Fixed(if (Flags.modesDialogSingleRows()) 1 else 2),
		modifier = Modifier.fillMaxWidth().heightIn(max = 300.dp),
		columns = GridCells.Fixed(1),
		modifier = Modifier.fillMaxWidth().heightIn(max = 320.dp),
		verticalArrangement = Arrangement.spacedBy(8.dp),
		horizontalArrangement = Arrangement.spacedBy(8.dp),
		) {