Merge "Use final strings for edit mode and adjust the reset dialog UI" into main (c2ad1ac2) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3930,10 +3930,10 @@
	</string>		</string>
	<!-- Title for the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->		<!-- Title for the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->
	<string name="qs_edit_mode_reset_dialog_title">		<string name="qs_edit_mode_reset_dialog_title">
	Reset tiles		Reset all tiles?
	</string>		</string>
	<!-- Content of the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->		<!-- Content of the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->
	<string name="qs_edit_mode_reset_dialog_content">		<string name="qs_edit_mode_reset_dialog_content">
	Reset tiles to their original order and sizes?		All Quick Settings tiles will reset to the device’s original settings
	</string>		</string>
	</resources>		</resources>

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -225,7 +225,7 @@ fun DefaultEditTileGrid(
	if (dragIsInProgress) {		if (dragIsInProgress) {
	RemoveTileTarget()		RemoveTileTarget()
	} else {		} else {
	Text(text = "Hold and drag to rearrange tiles.")		Text(text = stringResource(id = R.string.drag_to_rearrange_tiles))
	}		}
	}		}
	}		}
	@@ -243,7 +243,9 @@ fun DefaultEditTileGrid(
	spacedBy(dimensionResource(id = R.dimen.qs_label_container_margin)),		spacedBy(dimensionResource(id = R.dimen.qs_label_container_margin)),
	modifier = modifier.fillMaxSize(),		modifier = modifier.fillMaxSize(),
	) {		) {
	EditGridHeader { Text(text = "Hold and drag to add tiles.") }		EditGridHeader {
			Text(text = stringResource(id = R.string.drag_to_add_tiles))
			}

	AvailableTileGrid(otherTiles, selectionState, columns, listState)		AvailableTileGrid(otherTiles, selectionState, columns, listState)
	}		}
	@@ -289,7 +291,7 @@ private fun RemoveTileTarget() {
	.padding(10.dp),		.padding(10.dp),
	) {		) {
	Icon(imageVector = Icons.Default.Clear, contentDescription = null)		Icon(imageVector = Icons.Default.Clear, contentDescription = null)
	Text(text = "Remove")		Text(text = stringResource(id = R.string.qs_customize_remove))
	}		}
	}		}

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
	import androidx.lifecycle.DefaultLifecycleObserver		import androidx.lifecycle.DefaultLifecycleObserver
	import androidx.lifecycle.LifecycleOwner		import androidx.lifecycle.LifecycleOwner
	import com.android.compose.PlatformButton		import com.android.compose.PlatformButton
	import com.android.compose.PlatformOutlinedButton		import com.android.compose.PlatformTextButton
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dialog.ui.composable.AlertDialogContent		import com.android.systemui.dialog.ui.composable.AlertDialogContent
	import com.android.systemui.qs.panels.domain.interactor.EditTilesResetInteractor		import com.android.systemui.qs.panels.domain.interactor.EditTilesResetInteractor
	@@ -84,8 +84,8 @@ constructor(
	Text(stringResource(id = android.R.string.ok))		Text(stringResource(id = android.R.string.ok))
	}		}
	},		},
	neutralButton = {		negativeButton = {
	PlatformOutlinedButton(onClick = { dialog.dismiss() }) {		PlatformTextButton(onClick = { dialog.dismiss() }) {
	Text(stringResource(id = android.R.string.cancel))		Text(stringResource(id = android.R.string.cancel))
	}		}
	},		},