diff options
| author | Roman Birg <roman@cyngn.com> | 2014-11-12 13:46:38 -0800 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2014-11-12 22:46:18 +0000 |
| commit | 38a90981e63fffca45ed3b0b6a6d16a3f98404ad (patch) | |
| tree | 4ae27b5a4c11ad61efeb30693bd9bcf348787ab0 | |
| parent | 2a99ff27231d9ca380ccb47877365f922c1bef64 (diff) | |
| download | packages_apps_ContactsCommon-38a90981e63fffca45ed3b0b6a6d16a3f98404ad.tar.gz packages_apps_ContactsCommon-38a90981e63fffca45ed3b0b6a6d16a3f98404ad.tar.bz2 packages_apps_ContactsCommon-38a90981e63fffca45ed3b0b6a6d16a3f98404ad.zip | |
ContactsCommon: use formatted sim name when displaying msim cards
Change-Id: If8295d553cd33308c055429f8c1355b3a8b6c24b
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | src/com/android/contacts/common/MoreContactUtils.java | 3 | ||||
| -rw-r--r-- | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java index 75e9b255..f72507a3 100644 --- a/src/com/android/contacts/common/MoreContactUtils.java +++ b/src/com/android/contacts/common/MoreContactUtils.java @@ -879,8 +879,7 @@ public class MoreContactUtils { } MSimTelephonyManager stm = getMSimTelephonyManager(); if (stm.isMultiSimEnabled()) { - return Settings.Global.getSimNameForSubscription(context, subscription, - context.getString(R.string.account_sim) + " " + (subscription + 1)); + return stm.getFormattedSimName(context, subscription); } return context.getString(R.string.account_sim); diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index 1a167734..985180cd 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -189,10 +189,6 @@ public class ImportExportDialogFragment extends DialogFragment isMenuItemClicked = false; } - private String getMultiSimName(int subscription) { - return Settings.Global.getSimNameForSubscription(getActivity(), subscription, - String.valueOf(subscription + 1)); - } @Override public Dialog onCreateDialog(Bundle savedInstanceState) { // Wrap our context to inflate list items using the correct theme @@ -1001,7 +997,8 @@ public class ImportExportDialogFragment extends DialogFragment case R.string.export_to_sim: { String[] items = new String[MSimTelephonyManager.getDefault().getPhoneCount()]; for (int i = 0; i < items.length; i++) { - items[i] = getString(R.string.export_to_sim) + ": " + getMultiSimName(i); + items[i] = getString(R.string.export_to_sim) + ": " + + MoreContactUtils.getMultiSimAliasesName(getActivity(), i); } mExportSub = SimContactsConstants.SUB_1; ExportToSimSelectListener listener = new ExportToSimSelectListener(); @@ -1062,7 +1059,8 @@ public class ImportExportDialogFragment extends DialogFragment // item is for sim account to show String[] items = new String[MSimTelephonyManager.getDefault().getPhoneCount()]; for (int i = 0; i < items.length; i++) { - items[i] = getString(R.string.import_from_sim) + ": " + getMultiSimName(i); + items[i] = getString(R.string.import_from_sim) + ": " + + MoreContactUtils.getMultiSimAliasesName(getActivity(), i); } new AlertDialog.Builder(getActivity()) .setTitle(R.string.import_from_sim) |