Merge "Expose NORMALIZED_NUMBER in the API"

This commit is contained in:
Daniel Lehmann
2012-04-06 20:22:57 -07:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 5 deletions

View File

@@ -16688,6 +16688,7 @@ package android.provider {
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String NORMALIZED_NUMBER = "data4";
field public static final java.lang.String NUMBER = "data1";
field public static final int TYPE_ASSISTANT = 19; // 0x13
field public static final int TYPE_CALLBACK = 8; // 0x8
@@ -17048,6 +17049,7 @@ package android.provider {
protected static abstract interface ContactsContract.PhoneLookupColumns {
field public static final java.lang.String LABEL = "label";
field public static final java.lang.String NORMALIZED_NUMBER = "normalized_number";
field public static final java.lang.String NUMBER = "number";
field public static final java.lang.String TYPE = "type";
}

View File

@@ -4531,8 +4531,6 @@ public final class ContactsContract {
/**
* The phone number's E164 representation.
* <P>Type: TEXT</P>
*
* @hide
*/
public static final String NORMALIZED_NUMBER = "normalized_number";
}
@@ -5408,10 +5406,10 @@ public final class ContactsContract {
public static final String NUMBER = DATA;
/**
* The phone number's E164 representation.
* The phone number's E164 representation. This value can be omitted in which
* case the provider will try to automatically infer it. If present, {@link #NUMBER}
* has to be set as well (it will be ignored otherwise).
* <P>Type: TEXT</P>
*
* @hide
*/
public static final String NORMALIZED_NUMBER = DATA4;