Added Context to inflate... methods used by EditContactActivity.
Change-Id: Ie481a8f9bb7b3b9cae56e7f7ba69ea349623c720
diff --git a/src/com/android/contacts/model/ExchangeSource.java b/src/com/android/contacts/model/ExchangeSource.java
index 2313b33..11ccd44 100644
--- a/src/com/android/contacts/model/ExchangeSource.java
+++ b/src/com/android/contacts/model/ExchangeSource.java
@@ -47,23 +47,23 @@
@Override
protected void inflate(Context context, int inflateLevel) {
- inflateStructuredName(inflateLevel);
- inflateNickname(inflateLevel);
- inflatePhone(inflateLevel);
- inflateEmail(inflateLevel);
- inflateStructuredPostal(inflateLevel);
- inflateIm(inflateLevel);
- inflateOrganization(inflateLevel);
- inflatePhoto(inflateLevel);
- inflateNote(inflateLevel);
- inflateWebsite(inflateLevel);
+ inflateStructuredName(context, inflateLevel);
+ inflateNickname(context, inflateLevel);
+ inflatePhone(context, inflateLevel);
+ inflateEmail(context, inflateLevel);
+ inflateStructuredPostal(context, inflateLevel);
+ inflateIm(context, inflateLevel);
+ inflateOrganization(context, inflateLevel);
+ inflatePhoto(context, inflateLevel);
+ inflateNote(context, inflateLevel);
+ inflateWebsite(context, inflateLevel);
setInflatedLevel(inflateLevel);
}
@Override
- protected DataKind inflateStructuredName(int inflateLevel) {
- final DataKind kind = super.inflateStructuredName(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateStructuredName(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateStructuredName(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
final boolean useJapaneseOrder =
@@ -106,8 +106,8 @@
}
@Override
- protected DataKind inflateNickname(int inflateLevel) {
- final DataKind kind = super.inflateNickname(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateNickname(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateNickname(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.isList = false;
@@ -121,8 +121,8 @@
}
@Override
- protected DataKind inflatePhone(int inflateLevel) {
- final DataKind kind = super.inflatePhone(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflatePhone(Context context, int inflateLevel) {
+ final DataKind kind = super.inflatePhone(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeColumn = Phone.TYPE;
@@ -153,8 +153,8 @@
}
@Override
- protected DataKind inflateEmail(int inflateLevel) {
- final DataKind kind = super.inflateEmail(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateEmail(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateEmail(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeOverallMax = 3;
@@ -167,8 +167,8 @@
}
@Override
- protected DataKind inflateStructuredPostal(int inflateLevel) {
- final DataKind kind = super.inflateStructuredPostal(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateStructuredPostal(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateStructuredPostal(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
final boolean useJapaneseOrder =
@@ -209,8 +209,8 @@
}
@Override
- protected DataKind inflateIm(int inflateLevel) {
- final DataKind kind = super.inflateIm(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateIm(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateIm(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeOverallMax = 3;
@@ -242,8 +242,8 @@
}
@Override
- protected DataKind inflateOrganization(int inflateLevel) {
- final DataKind kind = super.inflateOrganization(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateOrganization(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateOrganization(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.isList = false;
@@ -265,8 +265,8 @@
}
@Override
- protected DataKind inflatePhoto(int inflateLevel) {
- final DataKind kind = super.inflatePhoto(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflatePhoto(Context context, int inflateLevel) {
+ final DataKind kind = super.inflatePhoto(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeOverallMax = 1;
@@ -279,8 +279,8 @@
}
@Override
- protected DataKind inflateNote(int inflateLevel) {
- final DataKind kind = super.inflateNote(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateNote(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateNote(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.fieldList = Lists.newArrayList();
@@ -291,8 +291,8 @@
}
@Override
- protected DataKind inflateWebsite(int inflateLevel) {
- final DataKind kind = super.inflateWebsite(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateWebsite(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateWebsite(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.isList = false;
diff --git a/src/com/android/contacts/model/ExternalSource.java b/src/com/android/contacts/model/ExternalSource.java
index d554c3a..aa9d888 100644
--- a/src/com/android/contacts/model/ExternalSource.java
+++ b/src/com/android/contacts/model/ExternalSource.java
@@ -105,8 +105,8 @@
}
// Bring in name and photo from fallback source, which are non-optional
- inflateStructuredName(inflateLevel);
- inflatePhoto(inflateLevel);
+ inflateStructuredName(context, inflateLevel);
+ inflatePhoto(context, inflateLevel);
setInflatedLevel(inflateLevel);
}
diff --git a/src/com/android/contacts/model/FallbackSource.java b/src/com/android/contacts/model/FallbackSource.java
index 08c0e28..723a053 100644
--- a/src/com/android/contacts/model/FallbackSource.java
+++ b/src/com/android/contacts/model/FallbackSource.java
@@ -66,17 +66,17 @@
@Override
protected void inflate(Context context, int inflateLevel) {
- inflateStructuredName(inflateLevel);
- inflateNickname(inflateLevel);
- inflatePhone(inflateLevel);
- inflateEmail(inflateLevel);
- inflateStructuredPostal(inflateLevel);
- inflateIm(inflateLevel);
- inflateOrganization(inflateLevel);
- inflatePhoto(inflateLevel);
- inflateNote(inflateLevel);
- inflateWebsite(inflateLevel);
- inflateEvent(inflateLevel);
+ inflateStructuredName(context, inflateLevel);
+ inflateNickname(context, inflateLevel);
+ inflatePhone(context, inflateLevel);
+ inflateEmail(context, inflateLevel);
+ inflateStructuredPostal(context, inflateLevel);
+ inflateIm(context, inflateLevel);
+ inflateOrganization(context, inflateLevel);
+ inflatePhoto(context, inflateLevel);
+ inflateNote(context, inflateLevel);
+ inflateWebsite(context, inflateLevel);
+ inflateEvent(context, inflateLevel);
setInflatedLevel(inflateLevel);
@@ -102,7 +102,7 @@
return new EditType(type, Organization.getTypeLabelResource(type));
}
- protected DataKind inflateStructuredName(int inflateLevel) {
+ protected DataKind inflateStructuredName(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(StructuredName.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(StructuredName.CONTENT_ITEM_TYPE,
@@ -151,7 +151,7 @@
return kind;
}
- protected DataKind inflateNickname(int inflateLevel) {
+ protected DataKind inflateNickname(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Nickname.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Nickname.CONTENT_ITEM_TYPE,
@@ -174,7 +174,7 @@
return kind;
}
- protected DataKind inflatePhone(int inflateLevel) {
+ protected DataKind inflatePhone(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Phone.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Phone.CONTENT_ITEM_TYPE, R.string.phoneLabelsGroup,
@@ -219,7 +219,7 @@
return kind;
}
- protected DataKind inflateEmail(int inflateLevel) {
+ protected DataKind inflateEmail(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Email.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Email.CONTENT_ITEM_TYPE,
@@ -245,7 +245,7 @@
return kind;
}
- protected DataKind inflateStructuredPostal(int inflateLevel) {
+ protected DataKind inflateStructuredPostal(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(StructuredPostal.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(StructuredPostal.CONTENT_ITEM_TYPE,
@@ -303,7 +303,7 @@
return kind;
}
- protected DataKind inflateIm(int inflateLevel) {
+ protected DataKind inflateIm(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Im.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Im.CONTENT_ITEM_TYPE, R.string.imLabelsGroup,
@@ -340,7 +340,7 @@
return kind;
}
- protected DataKind inflateOrganization(int inflateLevel) {
+ protected DataKind inflateOrganization(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Organization.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Organization.CONTENT_ITEM_TYPE,
@@ -367,7 +367,7 @@
return kind;
}
- protected DataKind inflatePhoto(int inflateLevel) {
+ protected DataKind inflatePhoto(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Photo.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Photo.CONTENT_ITEM_TYPE, -1, -1, -1, true));
@@ -381,7 +381,7 @@
return kind;
}
- protected DataKind inflateNote(int inflateLevel) {
+ protected DataKind inflateNote(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Note.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Note.CONTENT_ITEM_TYPE,
@@ -400,7 +400,7 @@
return kind;
}
- protected DataKind inflateWebsite(int inflateLevel) {
+ protected DataKind inflateWebsite(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Website.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Website.CONTENT_ITEM_TYPE,
@@ -421,7 +421,7 @@
return kind;
}
- protected DataKind inflateEvent(int inflateLevel) {
+ protected DataKind inflateEvent(Context context, int inflateLevel) {
DataKind kind = getKindForMimetype(Event.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Event.CONTENT_ITEM_TYPE,
diff --git a/src/com/android/contacts/model/GoogleSource.java b/src/com/android/contacts/model/GoogleSource.java
index a4b4cb2..7b16c93 100644
--- a/src/com/android/contacts/model/GoogleSource.java
+++ b/src/com/android/contacts/model/GoogleSource.java
@@ -51,17 +51,17 @@
@Override
protected void inflate(Context context, int inflateLevel) {
- inflateStructuredName(inflateLevel);
- inflateNickname(inflateLevel);
- inflatePhone(inflateLevel);
- inflateEmail(inflateLevel);
- inflateStructuredPostal(inflateLevel);
- inflateIm(inflateLevel);
- inflateOrganization(inflateLevel);
- inflatePhoto(inflateLevel);
- inflateNote(inflateLevel);
- inflateWebsite(inflateLevel);
- inflateEvent(inflateLevel);
+ inflateStructuredName(context, inflateLevel);
+ inflateNickname(context, inflateLevel);
+ inflatePhone(context, inflateLevel);
+ inflateEmail(context, inflateLevel);
+ inflateStructuredPostal(context, inflateLevel);
+ inflateIm(context, inflateLevel);
+ inflateOrganization(context, inflateLevel);
+ inflatePhoto(context, inflateLevel);
+ inflateNote(context, inflateLevel);
+ inflateWebsite(context, inflateLevel);
+ inflateEvent(context, inflateLevel);
// TODO: GOOGLE: GROUPMEMBERSHIP
@@ -70,18 +70,18 @@
}
@Override
- protected DataKind inflateStructuredName(int inflateLevel) {
- return super.inflateStructuredName(inflateLevel);
+ protected DataKind inflateStructuredName(Context context, int inflateLevel) {
+ return super.inflateStructuredName(context, inflateLevel);
}
@Override
- protected DataKind inflateNickname(int inflateLevel) {
- return super.inflateNickname(inflateLevel);
+ protected DataKind inflateNickname(Context context, int inflateLevel) {
+ return super.inflateNickname(context, inflateLevel);
}
@Override
- protected DataKind inflatePhone(int inflateLevel) {
- final DataKind kind = super.inflatePhone(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflatePhone(Context context, int inflateLevel) {
+ final DataKind kind = super.inflatePhone(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeColumn = Phone.TYPE;
@@ -104,8 +104,8 @@
}
@Override
- protected DataKind inflateEmail(int inflateLevel) {
- final DataKind kind = super.inflateEmail(ContactsSource.LEVEL_MIMETYPES);
+ protected DataKind inflateEmail(Context context, int inflateLevel) {
+ final DataKind kind = super.inflateEmail(context, ContactsSource.LEVEL_MIMETYPES);
if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
kind.typeColumn = Email.TYPE;
@@ -124,33 +124,33 @@
}
@Override
- protected DataKind inflateStructuredPostal(int inflateLevel) {
- return super.inflateStructuredPostal(inflateLevel);
+ protected DataKind inflateStructuredPostal(Context context, int inflateLevel) {
+ return super.inflateStructuredPostal(context, inflateLevel);
}
@Override
- protected DataKind inflateIm(int inflateLevel) {
- return super.inflateIm(inflateLevel);
+ protected DataKind inflateIm(Context context, int inflateLevel) {
+ return super.inflateIm(context, inflateLevel);
}
@Override
- protected DataKind inflateOrganization(int inflateLevel) {
- return super.inflateOrganization(inflateLevel);
+ protected DataKind inflateOrganization(Context context, int inflateLevel) {
+ return super.inflateOrganization(context, inflateLevel);
}
@Override
- protected DataKind inflatePhoto(int inflateLevel) {
- return super.inflatePhoto(inflateLevel);
+ protected DataKind inflatePhoto(Context context, int inflateLevel) {
+ return super.inflatePhoto(context, inflateLevel);
}
@Override
- protected DataKind inflateNote(int inflateLevel) {
- return super.inflateNote(inflateLevel);
+ protected DataKind inflateNote(Context context, int inflateLevel) {
+ return super.inflateNote(context, inflateLevel);
}
@Override
- protected DataKind inflateWebsite(int inflateLevel) {
- return super.inflateWebsite(inflateLevel);
+ protected DataKind inflateWebsite(Context context, int inflateLevel) {
+ return super.inflateWebsite(context, inflateLevel);
}
// TODO: this should come from resource in the future