diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-02-01 03:26:17 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-22 15:03:04 -0700 |
| commit | e60c21cb6901cbf6f7b33c44e91cdbe272619e6c (patch) | |
| tree | 40cd1c92b9a456d08cc1980a35946e5dd5e29fc3 /src | |
| parent | 7aa1e203c8ade020dbb1ff64258650f3454f1b7e (diff) | |
| download | android_packages_apps_ContactsCommon-e60c21cb6901cbf6f7b33c44e91cdbe272619e6c.tar.gz android_packages_apps_ContactsCommon-e60c21cb6901cbf6f7b33c44e91cdbe272619e6c.tar.bz2 android_packages_apps_ContactsCommon-e60c21cb6901cbf6f7b33c44e91cdbe272619e6c.zip | |
ContactsCommon: Improve CAF strings
Change-Id: Ia8724c749e51028a92544bdf476fbbbfe51e6444
Diffstat (limited to 'src')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index e13f1649..6908b09d 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -650,9 +650,9 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment // add toast handler when export is canceled case TOAST_EXPORT_CANCELED: - int exportCount = msg.arg1; - Toast.makeText(mPeople,mPeople.getString(R.string.export_cancelled, - String.valueOf(exportCount)), Toast.LENGTH_SHORT).show(); + String text = mPeople.getResources().getQuantityString( + R.plurals.export_cancelled, msg.arg1, msg.arg1); + Toast.makeText(mPeople, text, Toast.LENGTH_SHORT).show(); break; // add toast handler when no phone or email @@ -663,7 +663,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment Toast.LENGTH_SHORT).show(); break; case TOAST_SIM_CARD_NOT_LOAD_COMPLETE: - Toast.makeText(mPeople, R.string.sim_contacts_not_load, + Toast.makeText(mPeople, R.string.sim_contacts_not_loaded, Toast.LENGTH_SHORT).show(); break; } @@ -691,7 +691,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment // add a cancel button to let user cancel explicitly. mExportProgressDlg.setButton(DialogInterface.BUTTON_NEGATIVE, - mPeople.getString(R.string.progressdialog_cancel), + mPeople.getString(android.R.string.cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java b/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java index 5cf1d08a..a54f791a 100755..100644 --- a/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java @@ -18,13 +18,13 @@ public class ImportSIMContactsDialogFragment extends DialogFragment { // Use the Builder class for convenient dialog construction AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setMessage(R.string.import_contacts_sim) - .setPositiveButton(R.string.import_contacts_sim_confirm, + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { ImportExportDialogFragment.show(getFragmentManager(), false, ImportSIMContactsDialogFragment.class); }}) - .setNegativeButton(R.string.import_contacts_sim_cancel, + .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // Nothing to do diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java index 71e99e89..2ea53f11 100644 --- a/src/com/android/contacts/common/util/AccountSelectionUtil.java +++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java @@ -287,7 +287,7 @@ public class AccountSelectionUtil { for (i = 1; i <= numPhones; i++) { subList[i-1] = "SIM" + i; } - subList[i-1] = context.getString(R.string.Import_All); + subList[i-1] = context.getString(R.string.import_contacts_from_all_cards); builder.setSingleChoiceItems(subList, -1, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { |