diff options
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 929d9de8..b24261f2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -422,7 +422,7 @@ a ren't members of any other group. [CHAR LIMIT=25] --> <string name="import_from_sim">Import from SIM card</string> <!-- Action string for selecting a SIM subscription for importing contacts --> - <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string> + <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string> <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number --> <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string> diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index a9bd6847..6f002e45 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -29,6 +29,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract.Contacts; +import android.telephony.PhoneNumberUtils; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -279,21 +280,24 @@ public class ImportExportDialogFragment extends DialogFragment dismiss(); } - private String getSubDescription(SubscriptionInfo record) { + private CharSequence getSubDescription(SubscriptionInfo record) { CharSequence name = record.getDisplayName(); if (TextUtils.isEmpty(record.getNumber())) { // Don't include the phone number in the description, since we don't know the number. return getString(R.string.import_from_sim_summary_no_number, name); } - return getString(R.string.import_from_sim_summary, name, record.getNumber()); + return TextUtils.expandTemplate( + getString(R.string.import_from_sim_summary), + name, + PhoneNumberUtils.ttsSpanAsPhoneNumber(record.getNumber())); } private static class AdapterEntry { - public final String mLabel; + public final CharSequence mLabel; public final int mChoiceResourceId; public final int mSubscriptionId; - public AdapterEntry(String label, int resId, int subId) { + public AdapterEntry(CharSequence label, int resId, int subId) { mLabel = label; mChoiceResourceId = resId; mSubscriptionId = subId; |