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

Commit 54b804fa authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Prioritize regular names over phonetic names. P1"

parents 47d740b9 643db51d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24914,6 +24914,7 @@ package android.provider { 
    field public static final int ORGANIZATION = 30; // 0x1e

    field public static final int PHONE = 20; // 0x14

    field public static final int STRUCTURED_NAME = 40; // 0x28

    field public static final int STRUCTURED_PHONETIC_NAME = 37; // 0x25

    field public static final int UNDEFINED = 0; // 0x0

  }

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -26514,6 +26514,7 @@ package android.provider {













    field public static final int ORGANIZATION = 30; // 0x1e















    field public static final int PHONE = 20; // 0x14















    field public static final int STRUCTURED_NAME = 40; // 0x28













    field public static final int STRUCTURED_PHONETIC_NAME = 37; // 0x25















    field public static final int UNDEFINED = 0; // 0x0















  }







































core/java/android/provider/ContactsContract.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -1010,7 +1010,8 @@ public final class ContactsContract {













    /**















     * Types of data used to produce the display name for a contact. In the order















     * of increasing priority: {@link #EMAIL}, {@link #PHONE},













     * {@link #ORGANIZATION}, {@link #NICKNAME}, {@link #STRUCTURED_NAME}.













     * {@link #ORGANIZATION}, {@link #NICKNAME}, {@link #STRUCTURED_PHONETIC_NAME},













     * {@link #STRUCTURED_NAME}.















     */















    public interface DisplayNameSources {















        public static final int UNDEFINED = 0;









@@ -1018,6 +1019,8 @@ public final class ContactsContract {













        public static final int PHONE = 20;















        public static final int ORGANIZATION = 30;















        public static final int NICKNAME = 35;













        /** Display name comes from a structured name that only has phonetic components. */













        public static final int STRUCTURED_PHONETIC_NAME = 37;















        public static final int STRUCTURED_NAME = 40;















    }