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

Merge "Avoid to save result of blank input." into main

Browse Source
This commit is contained in:
Tom Hsu
2024-06-06 08:43:37 +00:00
committed by Android (Google) Code Review
parent e3fdcad6a2 6be77d05cb
commit c417d19839
2 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
View File

@@ -87,12 +87,17 @@ private fun LabelSimPreference(
}
val phoneNumber = phoneNumber(subInfo)
val alertDialogPresenter = rememberAlertDialogPresenter(
confirmButton = AlertDialogButton(stringResource(R.string.mobile_network_sim_name_rename)) {
confirmButton = AlertDialogButton(
stringResource(R.string.mobile_network_sim_name_rename),
titleSimName.isNotBlank()
) {
onboardingService.addItemForRenaming(
subInfo, if (titleSimName.isEmpty()) originalSimCarrierName else titleSimName
)
},
dismissButton = AlertDialogButton(stringResource(R.string.cancel)) {
dismissButton = AlertDialogButton(
stringResource(R.string.cancel),
) {
titleSimName = onboardingService.getSubscriptionInfoDisplayName(subInfo)
},
title = stringResource(R.string.sim_onboarding_label_sim_dialog_title),
@@ -107,7 +112,7 @@ private fun LabelSimPreference(
placeholder = {Text(text = originalSimCarrierName)},
modifier = Modifier.fillMaxWidth().testTag("contentInput")
) {
titleSimName = if (it.matches(Regex("^\\s*$"))) originalSimCarrierName else it
titleSimName = it
}
},
)