From aebb53870c205afe5dc1f7491ea7bbf63615ea2c Mon Sep 17 00:00:00 2001 From: tomhsu Date: Mon, 15 Apr 2024 01:53:01 +0000 Subject: [PATCH] Fixs user input nothing, but save it successfully - If user inputs nothing, use original sim carrier name instead - Add a hint of showing original sim carrier name on edit field. fix: 333642116 fix: 335763360 Test: Manual test Test: atest passed Change-Id: I68fa6bb12c2039899c0a3d0d2aef7f7946b717d1 --- .../android/settings/spa/network/SimOnboardingLabelSim.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt b/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt index 66b7d4bb11a..2b40a91f96a 100644 --- a/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt +++ b/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt @@ -85,13 +85,16 @@ private fun LabelSimPreference( onboardingService: SimOnboardingService, subInfo: SubscriptionInfo, ) { + val originalSimCarrierName = subInfo.displayName.toString() var titleSimName by remember { mutableStateOf(onboardingService.getSubscriptionInfoDisplayName(subInfo)) } val phoneNumber = phoneNumber(subInfo) val alertDialogPresenter = rememberAlertDialogPresenter( 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)) { titleSimName = onboardingService.getSubscriptionInfoDisplayName(subInfo) @@ -105,6 +108,7 @@ private fun LabelSimPreference( SettingsOutlinedTextField( value = titleSimName, label = stringResource(R.string.sim_onboarding_label_sim_dialog_label), + placeholder = {Text(text = originalSimCarrierName)}, modifier = Modifier.fillMaxWidth() ) { titleSimName = it