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

Merge "Unhide PHONETIC_NAME_STYLE fields"

Browse Source
This commit is contained in:
Jay Shrauner
2015-08-07 21:26:50 +00:00
committed by Android (Google) Code Review
parent 1e872ec0d6 2619c5454e
commit 501b619e36
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -25355,6 +25355,7 @@ package android.provider {
field public static final java.lang.String JOB_DESCRIPTION = "data6";
field public static final java.lang.String OFFICE_LOCATION = "data9";
field public static final java.lang.String PHONETIC_NAME = "data8";
field public static final java.lang.String PHONETIC_NAME_STYLE = "data10";
field public static final java.lang.String SYMBOL = "data7";
field public static final java.lang.String TITLE = "data4";
field public static final int TYPE_OTHER = 2; // 0x2
@@ -25456,6 +25457,7 @@ package android.provider {
field public static final java.lang.String PHONETIC_FAMILY_NAME = "data9";
field public static final java.lang.String PHONETIC_GIVEN_NAME = "data7";
field public static final java.lang.String PHONETIC_MIDDLE_NAME = "data8";
field public static final java.lang.String PHONETIC_NAME_STYLE = "data11";
field public static final java.lang.String PREFIX = "data4";
field public static final java.lang.String SUFFIX = "data6";
}

2
api/system-current.txt
View File

@@ -27311,6 +27311,7 @@ package android.provider {
field public static final java.lang.String JOB_DESCRIPTION = "data6";
field public static final java.lang.String OFFICE_LOCATION = "data9";
field public static final java.lang.String PHONETIC_NAME = "data8";
field public static final java.lang.String PHONETIC_NAME_STYLE = "data10";
field public static final java.lang.String SYMBOL = "data7";
field public static final java.lang.String TITLE = "data4";
field public static final int TYPE_OTHER = 2; // 0x2
@@ -27412,6 +27413,7 @@ package android.provider {
field public static final java.lang.String PHONETIC_FAMILY_NAME = "data9";
field public static final java.lang.String PHONETIC_GIVEN_NAME = "data7";
field public static final java.lang.String PHONETIC_MIDDLE_NAME = "data8";
field public static final java.lang.String PHONETIC_NAME_STYLE = "data11";
field public static final java.lang.String PREFIX = "data4";
field public static final java.lang.String SUFFIX = "data6";
}

2
core/java/android/provider/ContactsContract.java
View File

@@ -5653,7 +5653,6 @@ public final class ContactsContract {
/**
* The alphabet used for capturing the phonetic name.
* See ContactsContract.PhoneticNameStyle.
* @hide
*/
public static final String PHONETIC_NAME_STYLE = DATA11;
}
@@ -6693,7 +6692,6 @@ public final class ContactsContract {
/**
* The alphabet used for capturing the phonetic name.
* See {@link ContactsContract.PhoneticNameStyle}.
* @hide
*/
public static final String PHONETIC_NAME_STYLE = DATA10;