summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/common/util
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-07-14 20:40:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-14 20:40:13 +0000
commit76d303fa5fa2ff107f0c233dd195787c9ed0b48b (patch)
tree2abff5b1853eef90573d36e8875cbf34e29a9885 /src/com/android/contacts/common/util
parent51f53811614d9185c8de800ed2403e9f3245b581 (diff)
parented2a24cb0a9f207e4f1211cfff51bd8e6bcfad90 (diff)
downloadpackages_apps_ContactsCommon-76d303fa5fa2ff107f0c233dd195787c9ed0b48b.tar.gz
packages_apps_ContactsCommon-76d303fa5fa2ff107f0c233dd195787c9ed0b48b.tar.bz2
packages_apps_ContactsCommon-76d303fa5fa2ff107f0c233dd195787c9ed0b48b.zip
Merge "Allow the user to select the vcards to import" into mnc-dev
Diffstat (limited to 'src/com/android/contacts/common/util')
-rw-r--r--src/com/android/contacts/common/util/AccountSelectionUtil.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java
index 1ea92ed0..ccbc2046 100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java
@@ -166,8 +166,8 @@ public class AccountSelectionUtil {
doImportFromSim(context, account, subscriptionId);
break;
}
- case R.string.import_from_sdcard: {
- doImportFromSdCard(context, account);
+ case R.string.import_from_vcf_file: {
+ doImportFromVcfFile(context, account);
break;
}
}
@@ -187,7 +187,7 @@ public class AccountSelectionUtil {
context.startActivity(importIntent);
}
- public static void doImportFromSdCard(Context context, AccountWithDataSet account) {
+ public static void doImportFromVcfFile(Context context, AccountWithDataSet account) {
Intent importIntent = new Intent(context, ImportVCardActivity.class);
if (account != null) {
importIntent.putExtra("account_name", account.name);