Merge "Change apn type into ExposedDropdownMenuCheckBox" into main (c94fdb1b) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/SettingsExposedDropdownMenuCheckBox.kt

+23 −6

Original line number	Diff line number	Diff line
		@@ -54,16 +54,18 @@ fun SettingsExposedDropdownMenuCheckBox(
		selectedOptionsState: SnapshotStateList<Int>,
		emptyVal: String = "",
		enabled: Boolean,
		errorMessage: String? = null,
		onSelectedOptionStateChange: () -> Unit,
		) {
		var dropDownWidth by remember { mutableIntStateOf(0) }
		var expanded by remember { mutableStateOf(false) }
		val allIndex = options.indexOf("*")
		ExposedDropdownMenuBox(
		expanded = expanded,
		onExpandedChange = { expanded = it },
		modifier = Modifier
		.width(350.dp)
		.padding(SettingsDimension.menuFieldPadding)
		.padding(SettingsDimension.textFieldPadding)
		.onSizeChanged { dropDownWidth = it.width },
		) {
		OutlinedTextField(
		@@ -72,6 +74,7 @@ fun SettingsExposedDropdownMenuCheckBox(
		.menuAnchor()
		.fillMaxWidth(),
		value = if (selectedOptionsState.size == 0) emptyVal
		else if (selectedOptionsState.contains(allIndex)) "*"
		else selectedOptionsState.joinToString { options[it] },
		onValueChange = {},
		label = { Text(text = label) },
		@@ -81,7 +84,13 @@ fun SettingsExposedDropdownMenuCheckBox(
		)
		},
		readOnly = true,
		enabled = enabled
		enabled = enabled,
		isError = errorMessage != null,
		supportingText = {
		if (errorMessage != null) {
		Text(text = errorMessage)
		}
		}
		)
		if (options.isNotEmpty()) {
		ExposedDropdownMenu(
		@@ -98,9 +107,17 @@ fun SettingsExposedDropdownMenuCheckBox(
		.fillMaxWidth(),
		onClick = {
		if (selectedOptionsState.contains(index)) {
		if (index == allIndex)
		selectedOptionsState.clear()
		else {
		selectedOptionsState.remove(
		index
		)
		if (selectedOptionsState.contains(allIndex))
		selectedOptionsState.remove(
		allIndex
		)
		}
		} else {
		selectedOptionsState.add(
		index