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

[SimOnbarding] correct the sim name at the Primary Sim

Browse Source 
The user can modify the name at Label sim page. The primary sim page
should show the name which is modified by the user.

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: manual test and verify the UI display the correct name.
Change-Id: Ica2a26ead4ec7d61a59bb3846ea07f278d7a1144
This commit is contained in:
songferngwang
2024-02-22 09:38:59 +00:00
parent b3646a4957
commit e83d8b22bc
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/SimOnboardingService.kt
View File

@@ -196,6 +196,16 @@ class SimOnboardingService {
return userSelectedSubInfoList.toList() return userSelectedSubInfoList.toList()
} }
fun getSelectedSubscriptionInfoListWithRenaming(): List<SubscriptionInfo> {
if (userSelectedSubInfoList.isEmpty()){
Log.d(TAG, "userSelectedSubInfoList is empty")
return activeSubInfoList
}
return userSelectedSubInfoList.map {
SubscriptionInfo.Builder(it).setDisplayName(getSubscriptionInfoDisplayName(it)).build()
}.toList()
}
fun addItemForRenaming(subInfo: SubscriptionInfo, newName: String) { fun addItemForRenaming(subInfo: SubscriptionInfo, newName: String) {
if (subInfo.displayName == newName) { if (subInfo.displayName == newName) {
return return

3
src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt
View File

@@ -77,7 +77,8 @@ fun SimOnboardingPrimarySimImpl(
SettingsBody(stringResource(id = R.string.sim_onboarding_primary_sim_msg)) SettingsBody(stringResource(id = R.string.sim_onboarding_primary_sim_msg))
} }
var selectedSubscriptionInfoList = onboardingService.getSelectedSubscriptionInfoList() var selectedSubscriptionInfoList =
onboardingService.getSelectedSubscriptionInfoListWithRenaming()
callsSelectedId.intValue = onboardingService.targetPrimarySimCalls callsSelectedId.intValue = onboardingService.targetPrimarySimCalls
textsSelectedId.intValue = onboardingService.targetPrimarySimTexts textsSelectedId.intValue = onboardingService.targetPrimarySimTexts
mobileDataSelectedId.intValue = onboardingService.targetPrimarySimMobileData mobileDataSelectedId.intValue = onboardingService.targetPrimarySimMobileData