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
This commit is contained in:
@@ -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
|
||||||
|
Reference in New Issue
Block a user