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

Merge "Fixs user input nothing, but save it successfully" into main

Browse Source
This commit is contained in:
Tom Hsu
2024-04-19 07:17:13 +00:00
committed by Android (Google) Code Review
parent 862e71b73d aebb53870c
commit fa6289f81e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,13 +85,16 @@ private fun LabelSimPreference(
onboardingService: SimOnboardingService, onboardingService: SimOnboardingService,
subInfo: SubscriptionInfo, subInfo: SubscriptionInfo,
) { ) {
val originalSimCarrierName = subInfo.displayName.toString()
var titleSimName by remember { var titleSimName by remember {
mutableStateOf(onboardingService.getSubscriptionInfoDisplayName(subInfo)) mutableStateOf(onboardingService.getSubscriptionInfoDisplayName(subInfo))
} }
val phoneNumber = phoneNumber(subInfo) val phoneNumber = phoneNumber(subInfo)
val alertDialogPresenter = rememberAlertDialogPresenter( val alertDialogPresenter = rememberAlertDialogPresenter(
confirmButton = AlertDialogButton(stringResource(R.string.mobile_network_sim_name_rename)) { confirmButton = AlertDialogButton(stringResource(R.string.mobile_network_sim_name_rename)) {
onboardingService.addItemForRenaming(subInfo, titleSimName) 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) titleSimName = onboardingService.getSubscriptionInfoDisplayName(subInfo)
@@ -105,6 +108,7 @@ private fun LabelSimPreference(
SettingsOutlinedTextField( SettingsOutlinedTextField(
value = titleSimName, value = titleSimName,
label = stringResource(R.string.sim_onboarding_label_sim_dialog_label), label = stringResource(R.string.sim_onboarding_label_sim_dialog_label),
placeholder = {Text(text = originalSimCarrierName)},
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {
titleSimName = it titleSimName = it