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

SubscriptionsPreferenceController shows the unique sim description.

Browse Source 
Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c
This commit is contained in:
Jeremy Goldman
2021-01-15 16:32:07 +08:00
parent 8e2ecd5918
commit 9d87cd9126
33 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -201,7 +201,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
showProgressDialog(
getString(
R.string.sim_action_switch_sub_dialog_progress,
mSubInfo.getDisplayName()));
SubscriptionUtil.getUniqueSubscriptionDisplayName(
mSubInfo, this)));
mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
return;
}
@@ -345,13 +346,14 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
/* Displays the SIM toggling confirmation dialog. */
private void showDisableSimConfirmDialog() {
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
mSubInfo, this);
String title =
mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())
mSubInfo == null || TextUtils.isEmpty(displayName)
? getString(
R.string.privileged_action_disable_sub_dialog_title_without_carrier)
: getString(
R.string.privileged_action_disable_sub_dialog_title,
mSubInfo.getDisplayName());
R.string.privileged_action_disable_sub_dialog_title, displayName);
ConfirmDialogFragment.show(
this,
@@ -402,40 +404,48 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
private String getSwitchDialogPosBtnText() {
return mIsEsimOperation
? getString(
R.string.sim_action_switch_sub_dialog_confirm, mSubInfo.getDisplayName())
R.string.sim_action_switch_sub_dialog_confirm,
SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this))
: getString(R.string.sim_switch_button);
}
private String getEnableSubscriptionTitle() {
if (mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())) {
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
mSubInfo, this);
if (mSubInfo == null || TextUtils.isEmpty(displayName)) {
return getString(R.string.sim_action_enable_sub_dialog_title_without_carrier_name);
}
return getString(R.string.sim_action_enable_sub_dialog_title, mSubInfo.getDisplayName());
return getString(R.string.sim_action_enable_sub_dialog_title, displayName);
}
private String getSwitchSubscriptionTitle() {
if (mIsEsimOperation) {
return getString(
R.string.sim_action_switch_sub_dialog_title, mSubInfo.getDisplayName());
R.string.sim_action_switch_sub_dialog_title,
SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this));
}
return getString(R.string.sim_action_switch_psim_dialog_title);
}
private String getSwitchDialogBodyMsg(SubscriptionInfo activeSub, boolean betweenEsim) {
final CharSequence subInfoName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
mSubInfo, this);
final CharSequence activeSubName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
activeSub, this);
if (betweenEsim && mIsEsimOperation) {
return getString(
R.string.sim_action_switch_sub_dialog_text_downloaded,
mSubInfo.getDisplayName(),
activeSub.getDisplayName());
subInfoName,
activeSubName);
} else if (mIsEsimOperation) {
return getString(
R.string.sim_action_switch_sub_dialog_text,
mSubInfo.getDisplayName(),
activeSub.getDisplayName());
subInfoName,
activeSubName);
} else {
return getString(
R.string.sim_action_switch_sub_dialog_text_single_sim,
activeSub.getDisplayName());
activeSubName);
}
}