diff options
| author | Stuart Scott <stuartscott@google.com> | 2014-10-31 12:02:08 -0700 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2014-11-03 15:13:13 -0800 |
| commit | de48a0dacbdb17dbb6407fc11be42ae19138d728 (patch) | |
| tree | abf1a984223920bce2e9097cc379cc39ceb9df1c /src | |
| parent | 33c52bd1230a04ca95586682b9e126ffa2294ff1 (diff) | |
| download | android_packages_apps_ContactsCommon-de48a0dacbdb17dbb6407fc11be42ae19138d728.tar.gz android_packages_apps_ContactsCommon-de48a0dacbdb17dbb6407fc11be42ae19138d728.tar.bz2 android_packages_apps_ContactsCommon-de48a0dacbdb17dbb6407fc11be42ae19138d728.zip | |
Clean up public API of SubInfoRecord.
bug: 17575308
Change-Id: I80472fe13887b6ed3bfc422abbbe4644a6d6dcf5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index c6483cc8..41bf3043 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -120,11 +120,11 @@ public class ImportExportDialogFragment extends DialogFragment final List<SubInfoRecord> subInfoRecords = getAllSubInfoList(); if (subInfoRecords.size() == 1) { adapter.add(new AdapterEntry(getString(R.string.import_from_sim), - R.string.import_from_sim, subInfoRecords.get(0).subId)); + R.string.import_from_sim, subInfoRecords.get(0).getSubscriptionId())); } else { for (SubInfoRecord record : subInfoRecords) { adapter.add(new AdapterEntry(getSubDescription(record), - R.string.import_from_sim, record.subId)); + R.string.import_from_sim, record.getSubscriptionId())); } } } @@ -294,11 +294,12 @@ public class ImportExportDialogFragment extends DialogFragment } private String getSubDescription(SubInfoRecord record) { - if (TextUtils.isEmpty(record.number)) { + 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, record.displayName); + return getString(R.string.import_from_sim_summary_no_number, name); } - return getString(R.string.import_from_sim_summary, record.displayName, record.number); + return getString(R.string.import_from_sim_summary, name, record.getNumber()); } private static class AdapterEntry { |