Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501b619e authored by Jay Shrauner's avatar Jay Shrauner Committed by Android (Google) Code Review
Browse files

Merge "Unhide PHONETIC_NAME_STYLE fields"

parents 1e872ec0 2619c545

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

  }

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

  }

core/java/android/provider/ContactsContract.java

+0 −2
Original line number Diff line number Diff line
@@ -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;