Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.

Browse Source 
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp

* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
  Make vCard allow users to refrain image export. Useful when
This commit is contained in:
Daisuke Miyakawa
2010-04-19 18:52:07 -07:00
committed by Android Git Automerger
parent 8831d4dc55 c86f0779d6
commit e317240500
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/pim/vcard/VCardComposer.java
View File

@@ -534,9 +534,11 @@ public class VCardComposer {
.appendEmails(contentValuesListMap.get(Email.CONTENT_ITEM_TYPE))
.appendPostals(contentValuesListMap.get(StructuredPostal.CONTENT_ITEM_TYPE))
.appendOrganizations(contentValuesListMap.get(Organization.CONTENT_ITEM_TYPE))
.appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE))
.appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE))
.appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))
.appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE));
if ((mVCardType & VCardConfig.FLAG_REFRAIN_IMAGE_EXPORT) == 0) {
builder.appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE));
}
builder.appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))
.appendEvents(contentValuesListMap.get(Event.CONTENT_ITEM_TYPE))
.appendIms(contentValuesListMap.get(Im.CONTENT_ITEM_TYPE))
.appendRelation(contentValuesListMap.get(Relation.CONTENT_ITEM_TYPE));

8
core/java/android/pim/vcard/VCardConfig.java
View File

@@ -182,6 +182,14 @@ public class VCardConfig {
*/
public static final int FLAG_APPEND_TYPE_PARAM = 0x04000000;
/**
* <P>
* The flag asking exporter to refrain image export.
* </P>
* @hide will be deleted in the near future.
*/
public static final int FLAG_REFRAIN_IMAGE_EXPORT = 0x02000000;
//// The followings are VCard types available from importer/exporter. ////
/**