Update dialer sources.

Test: Built package and system image.

This change clobbers the old source, and is an export
from an internal Google repository.

The internal repository was forked form Android in March,
and this change includes modifications since then, to
near the v8 release.

Since the fork, we've moved code from monolithic to independent modules. In addition,
we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make.

New dependencies have been added:
- Dagger
- Auto-Value
- Glide
- Libshortcutbadger

Going forward, development will still be in Google3, and the Gerrit release
will become an automated export, with the next drop happening in ~ two weeks.

Android.mk includes local modifications from ToT.

Abridged changelog:

Bug fixes
● Not able to mute, add a call when using Phone app in multiwindow mode
● Double tap on keypad triggering multiple key and tones
● Reported spam numbers not showing as spam in the call log
● Crash when user tries to block number while Phone app is not set as default
● Crash when user picks a number from search auto-complete list

Visual Voicemail (VVM) improvements
● Share Voicemail audio via standard exporting mechanisms that support file attachment
(email, MMS, etc.)
● Make phone number, email and web sites in VVM transcript clickable
● Set PIN before declining VVM Terms of Service {Carrier}
● Set client type for outbound visual voicemail SMS {Carrier}

New incoming call and incall UI on older devices
(Android M)
● Updated Phone app icon
● New incall UI (large buttons, button labels)
● New and animated Answer/Reject gestures

Accessibility
● Add custom answer/decline call buttons on answer screen for touch exploration
accessibility services
● Increase size of touch target
● Add verbal feedback when a Voicemail fails to load
● Fix pressing of Phone buttons while in a phone call using Switch Access
● Fix selecting and opening contacts in talkback mode
● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text

Other
● Backup & Restore for App Preferences
● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is
connected
● Rename “Dialpad” to “Keypad”
● Show "Private number" for restricted calls
● Delete unused items (vcard, add contact, call history) from Phone menu

Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958

17 files changed, 1249 insertions, 0 deletions

diff --git a/java/com/android/contacts/common/model/dataitem/DataItem.java b/java/com/android/contacts/common/model/dataitem/DataItem.java
new file mode 100644
index 000000000..dc746055b
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/DataItem.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
+import android.provider.ContactsContract.CommonDataKinds.Identity;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.Nickname;
+import android.provider.ContactsContract.CommonDataKinds.Note;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.CommonDataKinds.Website;
+import android.provider.ContactsContract.Contacts.Data;
+import android.provider.ContactsContract.Contacts.Entity;
+import com.android.contacts.common.Collapser;
+import com.android.contacts.common.MoreContactUtils;
+import com.android.contacts.common.model.account.AccountType.EditType;
+
+/** This is the base class for data items, which represents a row from the Data table. */
+public class DataItem implements Collapser.Collapsible<DataItem> {
+
+  private final ContentValues mContentValues;
+  protected DataKind mKind;
+
+  protected DataItem(ContentValues values) {
+    mContentValues = values;
+  }
+
+  /**
+   * Factory for creating subclasses of DataItem objects based on the mimetype in the content
+   * values. Raw contact is the raw contact that this data item is associated with.
+   */
+  public static DataItem createFrom(ContentValues values) {
+    final String mimeType = values.getAsString(Data.MIMETYPE);
+    if (GroupMembership.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new GroupMembershipDataItem(values);
+    } else if (StructuredName.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new StructuredNameDataItem(values);
+    } else if (Phone.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new PhoneDataItem(values);
+    } else if (Email.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new EmailDataItem(values);
+    } else if (StructuredPostal.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new StructuredPostalDataItem(values);
+    } else if (Im.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new ImDataItem(values);
+    } else if (Organization.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new OrganizationDataItem(values);
+    } else if (Nickname.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new NicknameDataItem(values);
+    } else if (Note.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new NoteDataItem(values);
+    } else if (Website.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new WebsiteDataItem(values);
+    } else if (SipAddress.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new SipAddressDataItem(values);
+    } else if (Event.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new EventDataItem(values);
+    } else if (Relation.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new RelationDataItem(values);
+    } else if (Identity.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new IdentityDataItem(values);
+    } else if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
+      return new PhotoDataItem(values);
+    }
+
+    // generic
+    return new DataItem(values);
+  }
+
+  public ContentValues getContentValues() {
+    return mContentValues;
+  }
+
+  public Long getRawContactId() {
+    return mContentValues.getAsLong(Data.RAW_CONTACT_ID);
+  }
+
+  public void setRawContactId(long rawContactId) {
+    mContentValues.put(Data.RAW_CONTACT_ID, rawContactId);
+  }
+
+  /** Returns the data id. */
+  public long getId() {
+    return mContentValues.getAsLong(Data._ID);
+  }
+
+  /** Returns the mimetype of the data. */
+  public String getMimeType() {
+    return mContentValues.getAsString(Data.MIMETYPE);
+  }
+
+  public void setMimeType(String mimeType) {
+    mContentValues.put(Data.MIMETYPE, mimeType);
+  }
+
+  public boolean isPrimary() {
+    Integer primary = mContentValues.getAsInteger(Data.IS_PRIMARY);
+    return primary != null && primary != 0;
+  }
+
+  public boolean isSuperPrimary() {
+    Integer superPrimary = mContentValues.getAsInteger(Data.IS_SUPER_PRIMARY);
+    return superPrimary != null && superPrimary != 0;
+  }
+
+  public boolean hasKindTypeColumn(DataKind kind) {
+    final String key = kind.typeColumn;
+    return key != null
+        && mContentValues.containsKey(key)
+        && mContentValues.getAsInteger(key) != null;
+  }
+
+  public int getKindTypeColumn(DataKind kind) {
+    final String key = kind.typeColumn;
+    return mContentValues.getAsInteger(key);
+  }
+
+  /**
+   * Indicates the carrier presence value for the current {@link DataItem}.
+   *
+   * @return {@link Data#CARRIER_PRESENCE_VT_CAPABLE} if the {@link DataItem} supports carrier video
+   *     calling, {@code 0} otherwise.
+   */
+  public int getCarrierPresence() {
+    return mContentValues.getAsInteger(Data.CARRIER_PRESENCE);
+  }
+
+  /**
+   * This builds the data string depending on the type of data item by using the generic DataKind
+   * object underneath.
+   */
+  public String buildDataString(Context context, DataKind kind) {
+    if (kind.actionBody == null) {
+      return null;
+    }
+    CharSequence actionBody = kind.actionBody.inflateUsing(context, mContentValues);
+    return actionBody == null ? null : actionBody.toString();
+  }
+
+  /**
+   * This builds the data string(intended for display) depending on the type of data item. It
+   * returns the same value as {@link #buildDataString} by default, but certain data items can
+   * override it to provide their version of formatted data strings.
+   *
+   * @return Data string representing the data item, possibly formatted for display
+   */
+  public String buildDataStringForDisplay(Context context, DataKind kind) {
+    return buildDataString(context, kind);
+  }
+
+  public DataKind getDataKind() {
+    return mKind;
+  }
+
+  public void setDataKind(DataKind kind) {
+    mKind = kind;
+  }
+
+  public Integer getTimesUsed() {
+    return mContentValues.getAsInteger(Entity.TIMES_USED);
+  }
+
+  public Long getLastTimeUsed() {
+    return mContentValues.getAsLong(Entity.LAST_TIME_USED);
+  }
+
+  @Override
+  public void collapseWith(DataItem that) {
+    DataKind thisKind = getDataKind();
+    DataKind thatKind = that.getDataKind();
+    // If this does not have a type and that does, or if that's type is higher precedence,
+    // use that's type
+    if ((!hasKindTypeColumn(thisKind) && that.hasKindTypeColumn(thatKind))
+        || (that.hasKindTypeColumn(thatKind)
+            && getTypePrecedence(thisKind, getKindTypeColumn(thisKind))
+                > getTypePrecedence(thatKind, that.getKindTypeColumn(thatKind)))) {
+      mContentValues.put(thatKind.typeColumn, that.getKindTypeColumn(thatKind));
+      mKind = thatKind;
+    }
+
+    // Choose the max of the maxLines and maxLabelLines values.
+    mKind.maxLinesForDisplay = Math.max(thisKind.maxLinesForDisplay, thatKind.maxLinesForDisplay);
+
+    // If any of the collapsed entries are super primary make the whole thing super primary.
+    if (isSuperPrimary() || that.isSuperPrimary()) {
+      mContentValues.put(Data.IS_SUPER_PRIMARY, 1);
+      mContentValues.put(Data.IS_PRIMARY, 1);
+    }
+
+    // If any of the collapsed entries are primary make the whole thing primary.
+    if (isPrimary() || that.isPrimary()) {
+      mContentValues.put(Data.IS_PRIMARY, 1);
+    }
+
+    // Add up the times used
+    mContentValues.put(
+        Entity.TIMES_USED,
+        (getTimesUsed() == null ? 0 : getTimesUsed())
+            + (that.getTimesUsed() == null ? 0 : that.getTimesUsed()));
+
+    // Use the most recent time
+    mContentValues.put(
+        Entity.LAST_TIME_USED,
+        Math.max(
+            getLastTimeUsed() == null ? 0 : getLastTimeUsed(),
+            that.getLastTimeUsed() == null ? 0 : that.getLastTimeUsed()));
+  }
+
+  @Override
+  public boolean shouldCollapseWith(DataItem t, Context context) {
+    if (mKind == null || t.getDataKind() == null) {
+      return false;
+    }
+    return MoreContactUtils.shouldCollapse(
+        getMimeType(),
+        buildDataString(context, mKind),
+        t.getMimeType(),
+        t.buildDataString(context, t.getDataKind()));
+  }
+
+  /**
+   * Return the precedence for the the given {@link EditType#rawValue}, where lower numbers are
+   * higher precedence.
+   */
+  private static int getTypePrecedence(DataKind kind, int rawValue) {
+    for (int i = 0; i < kind.typeList.size(); i++) {
+      final EditType type = kind.typeList.get(i);
+      if (type.rawValue == rawValue) {
+        return i;
+      }
+    }
+    return Integer.MAX_VALUE;
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/DataKind.java b/java/com/android/contacts/common/model/dataitem/DataKind.java
new file mode 100644
index 000000000..3b470a2ae
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/DataKind.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.Data;
+import com.android.contacts.common.model.account.AccountType.EditField;
+import com.android.contacts.common.model.account.AccountType.EditType;
+import com.android.contacts.common.model.account.AccountType.StringInflater;
+import com.google.common.collect.Iterators;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * Description of a specific data type, usually marked by a unique {@link Data#MIMETYPE}. Includes
+ * details about how to view and edit {@link Data} rows of this kind, including the possible {@link
+ * EditType} labels and editable {@link EditField}.
+ */
+public final class DataKind {
+
+  public static final String PSEUDO_MIME_TYPE_DISPLAY_NAME = "#displayName";
+  public static final String PSEUDO_MIME_TYPE_PHONETIC_NAME = "#phoneticName";
+  public static final String PSEUDO_COLUMN_PHONETIC_NAME = "#phoneticName";
+
+  public String resourcePackageName;
+  public String mimeType;
+  public int titleRes;
+  public int iconAltRes;
+  public int iconAltDescriptionRes;
+  public int weight;
+  public boolean editable;
+
+  public StringInflater actionHeader;
+  public StringInflater actionAltHeader;
+  public StringInflater actionBody;
+
+  public String typeColumn;
+
+  /** Maximum number of values allowed in the list. -1 represents infinity. */
+  public int typeOverallMax;
+
+  public List<EditType> typeList;
+  public List<EditField> fieldList;
+
+  public ContentValues defaultValues;
+
+  /**
+   * If this is a date field, this specifies the format of the date when saving. The date includes
+   * year, month and day. If this is not a date field or the date field is not editable, this value
+   * should be ignored.
+   */
+  public SimpleDateFormat dateFormatWithoutYear;
+
+  /**
+   * If this is a date field, this specifies the format of the date when saving. The date includes
+   * month and day. If this is not a date field, the field is not editable or dates without year are
+   * not supported, this value should be ignored.
+   */
+  public SimpleDateFormat dateFormatWithYear;
+
+  /** The number of lines available for displaying this kind of data. Defaults to 1. */
+  public int maxLinesForDisplay;
+
+  public DataKind() {
+    maxLinesForDisplay = 1;
+  }
+
+  public DataKind(String mimeType, int titleRes, int weight, boolean editable) {
+    this.mimeType = mimeType;
+    this.titleRes = titleRes;
+    this.weight = weight;
+    this.editable = editable;
+    this.typeOverallMax = -1;
+    maxLinesForDisplay = 1;
+  }
+
+  public static String toString(SimpleDateFormat format) {
+    return format == null ? "(null)" : format.toPattern();
+  }
+
+  public static String toString(Iterable<?> list) {
+    if (list == null) {
+      return "(null)";
+    } else {
+      return Iterators.toString(list.iterator());
+    }
+  }
+
+  public String getKindString(Context context) {
+    return (titleRes == -1 || titleRes == 0) ? "" : context.getString(titleRes);
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append("DataKind:");
+    sb.append(" resPackageName=").append(resourcePackageName);
+    sb.append(" mimeType=").append(mimeType);
+    sb.append(" titleRes=").append(titleRes);
+    sb.append(" iconAltRes=").append(iconAltRes);
+    sb.append(" iconAltDescriptionRes=").append(iconAltDescriptionRes);
+    sb.append(" weight=").append(weight);
+    sb.append(" editable=").append(editable);
+    sb.append(" actionHeader=").append(actionHeader);
+    sb.append(" actionAltHeader=").append(actionAltHeader);
+    sb.append(" actionBody=").append(actionBody);
+    sb.append(" typeColumn=").append(typeColumn);
+    sb.append(" typeOverallMax=").append(typeOverallMax);
+    sb.append(" typeList=").append(toString(typeList));
+    sb.append(" fieldList=").append(toString(fieldList));
+    sb.append(" defaultValues=").append(defaultValues);
+    sb.append(" dateFormatWithoutYear=").append(toString(dateFormatWithoutYear));
+    sb.append(" dateFormatWithYear=").append(toString(dateFormatWithYear));
+
+    return sb.toString();
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/EmailDataItem.java b/java/com/android/contacts/common/model/dataitem/EmailDataItem.java
new file mode 100644
index 000000000..2fe297816
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/EmailDataItem.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+
+/**
+ * Represents an email data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Email}.
+ */
+public class EmailDataItem extends DataItem {
+
+  /* package */ EmailDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getAddress() {
+    return getContentValues().getAsString(Email.ADDRESS);
+  }
+
+  public String getDisplayName() {
+    return getContentValues().getAsString(Email.DISPLAY_NAME);
+  }
+
+  public String getData() {
+    return getContentValues().getAsString(Email.DATA);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Email.LABEL);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/EventDataItem.java b/java/com/android/contacts/common/model/dataitem/EventDataItem.java
new file mode 100644
index 000000000..15d9880b1
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/EventDataItem.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.text.TextUtils;
+
+/**
+ * Represents an event data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Event}.
+ */
+public class EventDataItem extends DataItem {
+
+  /* package */ EventDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getStartDate() {
+    return getContentValues().getAsString(Event.START_DATE);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Event.LABEL);
+  }
+
+  @Override
+  public boolean shouldCollapseWith(DataItem t, Context context) {
+    if (!(t instanceof EventDataItem) || mKind == null || t.getDataKind() == null) {
+      return false;
+    }
+    final EventDataItem that = (EventDataItem) t;
+    // Events can be different (anniversary, birthday) but have the same start date
+    if (!TextUtils.equals(getStartDate(), that.getStartDate())) {
+      return false;
+    } else if (!hasKindTypeColumn(mKind) || !that.hasKindTypeColumn(that.getDataKind())) {
+      return hasKindTypeColumn(mKind) == that.hasKindTypeColumn(that.getDataKind());
+    } else if (getKindTypeColumn(mKind) != that.getKindTypeColumn(that.getDataKind())) {
+      return false;
+    } else if (getKindTypeColumn(mKind) == Event.TYPE_CUSTOM
+        && !TextUtils.equals(getLabel(), that.getLabel())) {
+      // Check if custom types are not the same
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java b/java/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
new file mode 100644
index 000000000..f921b3c9d
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
+
+/**
+ * Represents a group memebership data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.GroupMembership}.
+ */
+public class GroupMembershipDataItem extends DataItem {
+
+  /* package */ GroupMembershipDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public Long getGroupRowId() {
+    return getContentValues().getAsLong(GroupMembership.GROUP_ROW_ID);
+  }
+
+  public String getGroupSourceId() {
+    return getContentValues().getAsString(GroupMembership.GROUP_SOURCE_ID);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/IdentityDataItem.java b/java/com/android/contacts/common/model/dataitem/IdentityDataItem.java
new file mode 100644
index 000000000..2badf92f7
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/IdentityDataItem.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.Identity;
+
+/**
+ * Represents an identity data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Identity}.
+ */
+public class IdentityDataItem extends DataItem {
+
+  /* package */ IdentityDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getIdentity() {
+    return getContentValues().getAsString(Identity.IDENTITY);
+  }
+
+  public String getNamespace() {
+    return getContentValues().getAsString(Identity.NAMESPACE);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/ImDataItem.java b/java/com/android/contacts/common/model/dataitem/ImDataItem.java
new file mode 100644
index 000000000..16b9fd094
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/ImDataItem.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.text.TextUtils;
+
+/**
+ * Represents an IM data item, wrapping the columns in {@link ContactsContract.CommonDataKinds.Im}.
+ */
+public class ImDataItem extends DataItem {
+
+  private final boolean mCreatedFromEmail;
+
+  /* package */ ImDataItem(ContentValues values) {
+    super(values);
+    mCreatedFromEmail = false;
+  }
+
+  private ImDataItem(ContentValues values, boolean createdFromEmail) {
+    super(values);
+    mCreatedFromEmail = createdFromEmail;
+  }
+
+  public static ImDataItem createFromEmail(EmailDataItem item) {
+    final ImDataItem im = new ImDataItem(new ContentValues(item.getContentValues()), true);
+    im.setMimeType(Im.CONTENT_ITEM_TYPE);
+    return im;
+  }
+
+  public String getData() {
+    if (mCreatedFromEmail) {
+      return getContentValues().getAsString(Email.DATA);
+    } else {
+      return getContentValues().getAsString(Im.DATA);
+    }
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Im.LABEL);
+  }
+
+  /** Values are one of Im.PROTOCOL_ */
+  public Integer getProtocol() {
+    return getContentValues().getAsInteger(Im.PROTOCOL);
+  }
+
+  public boolean isProtocolValid() {
+    return getProtocol() != null;
+  }
+
+  public String getCustomProtocol() {
+    return getContentValues().getAsString(Im.CUSTOM_PROTOCOL);
+  }
+
+  public int getChatCapability() {
+    Integer result = getContentValues().getAsInteger(Im.CHAT_CAPABILITY);
+    return result == null ? 0 : result;
+  }
+
+  public boolean isCreatedFromEmail() {
+    return mCreatedFromEmail;
+  }
+
+  @Override
+  public boolean shouldCollapseWith(DataItem t, Context context) {
+    if (!(t instanceof ImDataItem) || mKind == null || t.getDataKind() == null) {
+      return false;
+    }
+    final ImDataItem that = (ImDataItem) t;
+    // IM can have the same data put different protocol. These should not collapse.
+    if (!getData().equals(that.getData())) {
+      return false;
+    } else if (!isProtocolValid() || !that.isProtocolValid()) {
+      // Deal with invalid protocol as if it was custom. If either has a non valid
+      // protocol, check to see if the other has a valid that is not custom
+      if (isProtocolValid()) {
+        return getProtocol() == Im.PROTOCOL_CUSTOM;
+      } else if (that.isProtocolValid()) {
+        return that.getProtocol() == Im.PROTOCOL_CUSTOM;
+      }
+      return true;
+    } else if (getProtocol() != that.getProtocol()) {
+      return false;
+    } else if (getProtocol() == Im.PROTOCOL_CUSTOM
+        && !TextUtils.equals(getCustomProtocol(), that.getCustomProtocol())) {
+      // Check if custom protocols are not the same
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/NicknameDataItem.java b/java/com/android/contacts/common/model/dataitem/NicknameDataItem.java
new file mode 100644
index 000000000..a448be786
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/NicknameDataItem.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.Nickname;
+
+/**
+ * Represents a nickname data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Nickname}.
+ */
+public class NicknameDataItem extends DataItem {
+
+  public NicknameDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getName() {
+    return getContentValues().getAsString(Nickname.NAME);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Nickname.LABEL);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/NoteDataItem.java b/java/com/android/contacts/common/model/dataitem/NoteDataItem.java
new file mode 100644
index 000000000..b55ecc3e5
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/NoteDataItem.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.Note;
+
+/**
+ * Represents a note data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Note}.
+ */
+public class NoteDataItem extends DataItem {
+
+  /* package */ NoteDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getNote() {
+    return getContentValues().getAsString(Note.NOTE);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/OrganizationDataItem.java b/java/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
new file mode 100644
index 000000000..b33124838
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+
+/**
+ * Represents an organization data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Organization}.
+ */
+public class OrganizationDataItem extends DataItem {
+
+  /* package */ OrganizationDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getCompany() {
+    return getContentValues().getAsString(Organization.COMPANY);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Organization.LABEL);
+  }
+
+  public String getTitle() {
+    return getContentValues().getAsString(Organization.TITLE);
+  }
+
+  public String getDepartment() {
+    return getContentValues().getAsString(Organization.DEPARTMENT);
+  }
+
+  public String getJobDescription() {
+    return getContentValues().getAsString(Organization.JOB_DESCRIPTION);
+  }
+
+  public String getSymbol() {
+    return getContentValues().getAsString(Organization.SYMBOL);
+  }
+
+  public String getPhoneticName() {
+    return getContentValues().getAsString(Organization.PHONETIC_NAME);
+  }
+
+  public String getOfficeLocation() {
+    return getContentValues().getAsString(Organization.OFFICE_LOCATION);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/PhoneDataItem.java b/java/com/android/contacts/common/model/dataitem/PhoneDataItem.java
new file mode 100644
index 000000000..e1f56456a
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/PhoneDataItem.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
+
+/**
+ * Represents a phone data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Phone}.
+ */
+public class PhoneDataItem extends DataItem {
+
+  public static final String KEY_FORMATTED_PHONE_NUMBER = "formattedPhoneNumber";
+
+  /* package */ PhoneDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getNumber() {
+    return getContentValues().getAsString(Phone.NUMBER);
+  }
+
+  /** Returns the normalized phone number in E164 format. */
+  public String getNormalizedNumber() {
+    return getContentValues().getAsString(Phone.NORMALIZED_NUMBER);
+  }
+
+  public String getFormattedPhoneNumber() {
+    return getContentValues().getAsString(KEY_FORMATTED_PHONE_NUMBER);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Phone.LABEL);
+  }
+
+  public void computeFormattedPhoneNumber(String defaultCountryIso) {
+    final String phoneNumber = getNumber();
+    if (phoneNumber != null) {
+      final String formattedPhoneNumber =
+          PhoneNumberUtilsCompat.formatNumber(
+              phoneNumber, getNormalizedNumber(), defaultCountryIso);
+      getContentValues().put(KEY_FORMATTED_PHONE_NUMBER, formattedPhoneNumber);
+    }
+  }
+
+  /**
+   * Returns the formatted phone number (if already computed using {@link
+   * #computeFormattedPhoneNumber}). Otherwise this method returns the unformatted phone number.
+   */
+  @Override
+  public String buildDataStringForDisplay(Context context, DataKind kind) {
+    final String formatted = getFormattedPhoneNumber();
+    if (formatted != null) {
+      return formatted;
+    } else {
+      return getNumber();
+    }
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/PhotoDataItem.java b/java/com/android/contacts/common/model/dataitem/PhotoDataItem.java
new file mode 100644
index 000000000..0bf7a318b
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/PhotoDataItem.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts.Photo;
+
+/**
+ * Represents a photo data item, wrapping the columns in {@link ContactsContract.Contacts.Photo}.
+ */
+public class PhotoDataItem extends DataItem {
+
+  /* package */ PhotoDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public Long getPhotoFileId() {
+    return getContentValues().getAsLong(Photo.PHOTO_FILE_ID);
+  }
+
+  public byte[] getPhoto() {
+    return getContentValues().getAsByteArray(Photo.PHOTO);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/RelationDataItem.java b/java/com/android/contacts/common/model/dataitem/RelationDataItem.java
new file mode 100644
index 000000000..fdbcbb313
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/RelationDataItem.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.text.TextUtils;
+
+/**
+ * Represents a relation data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Relation}.
+ */
+public class RelationDataItem extends DataItem {
+
+  /* package */ RelationDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getName() {
+    return getContentValues().getAsString(Relation.NAME);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Relation.LABEL);
+  }
+
+  @Override
+  public boolean shouldCollapseWith(DataItem t, Context context) {
+    if (!(t instanceof RelationDataItem) || mKind == null || t.getDataKind() == null) {
+      return false;
+    }
+    final RelationDataItem that = (RelationDataItem) t;
+    // Relations can have different types (assistant, father) but have the same name
+    if (!TextUtils.equals(getName(), that.getName())) {
+      return false;
+    } else if (!hasKindTypeColumn(mKind) || !that.hasKindTypeColumn(that.getDataKind())) {
+      return hasKindTypeColumn(mKind) == that.hasKindTypeColumn(that.getDataKind());
+    } else if (getKindTypeColumn(mKind) != that.getKindTypeColumn(that.getDataKind())) {
+      return false;
+    } else if (getKindTypeColumn(mKind) == Relation.TYPE_CUSTOM
+        && !TextUtils.equals(getLabel(), that.getLabel())) {
+      // Check if custom types are not the same
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/SipAddressDataItem.java b/java/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
new file mode 100644
index 000000000..0ca9eae6d
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+
+/**
+ * Represents a sip address data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.SipAddress}.
+ */
+public class SipAddressDataItem extends DataItem {
+
+  /* package */ SipAddressDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getSipAddress() {
+    return getContentValues().getAsString(SipAddress.SIP_ADDRESS);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(SipAddress.LABEL);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java b/java/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
new file mode 100644
index 000000000..22bf037f1
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts.Data;
+
+/**
+ * Represents a structured name data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.StructuredName}.
+ */
+public class StructuredNameDataItem extends DataItem {
+
+  public StructuredNameDataItem() {
+    super(new ContentValues());
+    getContentValues().put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
+  }
+
+  /* package */ StructuredNameDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getDisplayName() {
+    return getContentValues().getAsString(StructuredName.DISPLAY_NAME);
+  }
+
+  public void setDisplayName(String name) {
+    getContentValues().put(StructuredName.DISPLAY_NAME, name);
+  }
+
+  public String getGivenName() {
+    return getContentValues().getAsString(StructuredName.GIVEN_NAME);
+  }
+
+  public String getFamilyName() {
+    return getContentValues().getAsString(StructuredName.FAMILY_NAME);
+  }
+
+  public String getPrefix() {
+    return getContentValues().getAsString(StructuredName.PREFIX);
+  }
+
+  public String getMiddleName() {
+    return getContentValues().getAsString(StructuredName.MIDDLE_NAME);
+  }
+
+  public String getSuffix() {
+    return getContentValues().getAsString(StructuredName.SUFFIX);
+  }
+
+  public String getPhoneticGivenName() {
+    return getContentValues().getAsString(StructuredName.PHONETIC_GIVEN_NAME);
+  }
+
+  public void setPhoneticGivenName(String name) {
+    getContentValues().put(StructuredName.PHONETIC_GIVEN_NAME, name);
+  }
+
+  public String getPhoneticMiddleName() {
+    return getContentValues().getAsString(StructuredName.PHONETIC_MIDDLE_NAME);
+  }
+
+  public void setPhoneticMiddleName(String name) {
+    getContentValues().put(StructuredName.PHONETIC_MIDDLE_NAME, name);
+  }
+
+  public String getPhoneticFamilyName() {
+    return getContentValues().getAsString(StructuredName.PHONETIC_FAMILY_NAME);
+  }
+
+  public void setPhoneticFamilyName(String name) {
+    getContentValues().put(StructuredName.PHONETIC_FAMILY_NAME, name);
+  }
+
+  public String getFullNameStyle() {
+    return getContentValues().getAsString(StructuredName.FULL_NAME_STYLE);
+  }
+
+  public boolean isSuperPrimary() {
+    final ContentValues contentValues = getContentValues();
+    return contentValues == null || !contentValues.containsKey(StructuredName.IS_SUPER_PRIMARY)
+        ? false
+        : contentValues.getAsBoolean(StructuredName.IS_SUPER_PRIMARY);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java b/java/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
new file mode 100644
index 000000000..18aae282c
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+
+/**
+ * Represents a structured postal data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.StructuredPostal}.
+ */
+public class StructuredPostalDataItem extends DataItem {
+
+  /* package */ StructuredPostalDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getFormattedAddress() {
+    return getContentValues().getAsString(StructuredPostal.FORMATTED_ADDRESS);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(StructuredPostal.LABEL);
+  }
+
+  public String getStreet() {
+    return getContentValues().getAsString(StructuredPostal.STREET);
+  }
+
+  public String getPOBox() {
+    return getContentValues().getAsString(StructuredPostal.POBOX);
+  }
+
+  public String getNeighborhood() {
+    return getContentValues().getAsString(StructuredPostal.NEIGHBORHOOD);
+  }
+
+  public String getCity() {
+    return getContentValues().getAsString(StructuredPostal.CITY);
+  }
+
+  public String getRegion() {
+    return getContentValues().getAsString(StructuredPostal.REGION);
+  }
+
+  public String getPostcode() {
+    return getContentValues().getAsString(StructuredPostal.POSTCODE);
+  }
+
+  public String getCountry() {
+    return getContentValues().getAsString(StructuredPostal.COUNTRY);
+  }
+}
diff --git a/java/com/android/contacts/common/model/dataitem/WebsiteDataItem.java b/java/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
new file mode 100644
index 000000000..b8400ecd1
--- /dev/null
+++ b/java/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.model.dataitem;
+
+import android.content.ContentValues;
+import android.provider.ContactsContract.CommonDataKinds.Website;
+
+/**
+ * Represents a website data item, wrapping the columns in {@link
+ * ContactsContract.CommonDataKinds.Website}.
+ */
+public class WebsiteDataItem extends DataItem {
+
+  /* package */ WebsiteDataItem(ContentValues values) {
+    super(values);
+  }
+
+  public String getUrl() {
+    return getContentValues().getAsString(Website.URL);
+  }
+
+  public String getLabel() {
+    return getContentValues().getAsString(Website.LABEL);
+  }
+}