PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When apn is read only, hide the save button." into main

Browse Source
This commit is contained in:
Charlotte Lu
2024-01-15 08:54:51 +00:00
committed by Android (Google) Code Review
parent 4130a95c5d f8bc0841bc
commit 89b966fff5
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/network/apn/ApnEditPageProvider.kt
View File

@@ -101,17 +101,19 @@ fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Ur
RegularScaffold( RegularScaffold(
title = if (apnDataInit.newApn) stringResource(id = R.string.apn_add) else stringResource(id = R.string.apn_edit), title = if (apnDataInit.newApn) stringResource(id = R.string.apn_add) else stringResource(id = R.string.apn_edit),
actions = { actions = {
IconButton(onClick = { if (!apnData.customizedConfig.readOnlyApn) {
if (!apnData.validEnabled) apnData = apnData.copy(validEnabled = true) IconButton(onClick = {
val valid = validateAndSaveApnData( if (!apnData.validEnabled) apnData = apnData.copy(validEnabled = true)
apnDataInit, val valid = validateAndSaveApnData(
apnData, apnDataInit,
context, apnData,
uriInit, context,
networkTypeSelectedOptionsState uriInit,
) networkTypeSelectedOptionsState
if (valid) navController.navigateBack() )
}) { Icon(imageVector = Icons.Outlined.Done, contentDescription = null) } if (valid) navController.navigateBack()
}) { Icon(imageVector = Icons.Outlined.Done, contentDescription = null) }
}
}, },
) { ) {
Column { Column {
@@ -212,7 +214,9 @@ fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Ur
emptyVal = stringResource(R.string.network_type_unspecified), emptyVal = stringResource(R.string.network_type_unspecified),
enabled = apnData.networkTypeEnabled enabled = apnData.networkTypeEnabled
) {} ) {}
if (!apnData.newApn) { if (!apnData.newApn && !apnData.customizedConfig.readOnlyApn
&& apnData.customizedConfig.isAddApnAllowed
) {
Preference( Preference(
object : PreferenceModel { object : PreferenceModel {
override val title = stringResource(R.string.menu_delete) override val title = stringResource(R.string.menu_delete)