diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-02-01 03:26:17 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-12-14 21:27:02 +0200 |
| commit | 2f17da1eb40197218981db65d547c25574b9e89f (patch) | |
| tree | 970e88652b0699170f55ded4560ad9c927125abf /src | |
| parent | 23f6138d740deaf1b994aafda63b5081ac9a1e3e (diff) | |
| download | android_packages_apps_ContactsCommon-2f17da1eb40197218981db65d547c25574b9e89f.tar.gz android_packages_apps_ContactsCommon-2f17da1eb40197218981db65d547c25574b9e89f.tar.bz2 android_packages_apps_ContactsCommon-2f17da1eb40197218981db65d547c25574b9e89f.zip | |
ContactsCommon: Improve CAF strings
* Also remove unused ones
Change-Id: Ia8724c749e51028a92544bdf476fbbbfe51e6444
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index a846b257..ffa9c0aa 100755 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -659,46 +659,43 @@ public class ImportExportDialogFragment extends DialogFragment private Handler mToastHandler = new Handler() { @Override public void handleMessage(Message msg) { - int exportCount = 0; switch (msg.what) { case TOAST_EXPORT_FAILED: - exportCount = msg.arg1; - Toast.makeText(mPeople, mPeople.getString(R.string.export_to_sim_failed, - exportCount), Toast.LENGTH_SHORT).show(); + Toast.makeText(mPeople, mPeople.getResources().getQuantityString( + R.plurals.export_to_sim_failed, msg.arg1, msg.arg1), + Toast.LENGTH_SHORT).show(); break; + case TOAST_EXPORT_FINISHED: Toast.makeText(mPeople, R.string.export_finished, Toast.LENGTH_SHORT) - .show(); + .show(); break; - // add toast handler when sim card is full case TOAST_SIM_CARD_FULL: - exportCount = msg.arg1; - Toast.makeText(mPeople, mPeople.getString(R.string.export_sim_card_full, - exportCount), Toast.LENGTH_SHORT).show(); + Toast.makeText(mPeople, mPeople.getResources().getQuantityString( + R.plurals.export_sim_card_full, msg.arg1, msg.arg1), + Toast.LENGTH_SHORT).show(); break; - //add the max count limit of Chinese code or not case TOAST_CONTACT_NAME_TOO_LONG: Toast.makeText(mPeople, R.string.tag_too_long, Toast.LENGTH_SHORT).show(); break; - // add toast handler when export is canceled case TOAST_EXPORT_CANCELED: - exportCount = msg.arg1; - Toast.makeText(mPeople,mPeople.getString(R.string.export_cancelled, - String.valueOf(exportCount)), Toast.LENGTH_SHORT).show(); + Toast.makeText(mPeople, mPeople.getResources().getQuantityString( + R.plurals.export_cancelled, msg.arg1, msg.arg1), + Toast.LENGTH_SHORT).show(); break; - // add toast handler when no phone or email case TOAST_EXPORT_NO_PHONE_OR_EMAIL: String name = (String) msg.obj; Toast.makeText(mPeople, mPeople.getString(R.string.export_no_phone_or_email, name), 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; } @@ -726,7 +723,7 @@ public class ImportExportDialogFragment extends DialogFragment // 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) { |