diff options
| author | Walter Jang <wjang@google.com> | 2015-08-11 19:31:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 19:31:58 +0000 |
| commit | e62c617bdc247212db6978cded9852bd84f3e3aa (patch) | |
| tree | 826e175c57e3f454bc79fcc53ff8c59c3dd3efd9 | |
| parent | 1af117eda9541dc3f20995c116a8c53934f75da9 (diff) | |
| parent | 4094304be66e1687414270e0710c3f84bbb2001d (diff) | |
| download | android_packages_apps_ContactsCommon-e62c617bdc247212db6978cded9852bd84f3e3aa.tar.gz android_packages_apps_ContactsCommon-e62c617bdc247212db6978cded9852bd84f3e3aa.tar.bz2 android_packages_apps_ContactsCommon-e62c617bdc247212db6978cded9852bd84f3e3aa.zip | |
am 4094304b: am 01c1cb22: Merge "Use text/x-vcard mime type when importing/exporting .vcf files" into mnc-dev
* commit '4094304be66e1687414270e0710c3f84bbb2001d':
Use text/x-vcard mime type when importing/exporting .vcf files
3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/common/vcard/ExportVCardActivity.java index 1a1b5e82..06448ebc 100644 --- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ExportVCardActivity.java @@ -126,7 +126,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, // Have the user choose where vcards will be exported to final Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); - intent.setType(VCardService.VCARD_MIME_TYPE); + intent.setType(VCardService.X_VCARD_MIME_TYPE); intent.putExtra(Intent.EXTRA_TITLE, mBidiFormatter.unicodeWrap( getString(R.string.exporting_vcard_filename), TextDirectionHeuristics.LTR)); startActivityForResult(intent, REQUEST_CREATE_DOCUMENT); diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java index 3b1ee50e..85b1417e 100644 --- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java @@ -593,9 +593,9 @@ public class ImportVCardActivity extends Activity { importVCard(uri); } else { Log.i(LOG_TAG, "Start vCard without Uri. The user will select vCard manually."); - final Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); - intent.setType(VCardService.VCARD_MIME_TYPE); + intent.setType(VCardService.X_VCARD_MIME_TYPE); intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true); startActivityForResult(intent, REQUEST_OPEN_DOCUMENT); diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java index ddd3c1fe..1d7837b1 100644 --- a/src/com/android/contacts/common/vcard/VCardService.java +++ b/src/com/android/contacts/common/vcard/VCardService.java @@ -66,7 +66,7 @@ public class VCardService extends Service { /* package */ static final String CACHE_FILE_PREFIX = "import_tmp_"; - /* package */ static final String VCARD_MIME_TYPE = "text/vcard"; + /* package */ static final String X_VCARD_MIME_TYPE = "text/x-vcard"; private class CustomMediaScannerConnectionClient implements MediaScannerConnectionClient { final MediaScannerConnection mConnection; |