diff options
| author | calderwoodra <calderwoodra@google.com> | 2017-11-20 10:40:49 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2017-11-20 11:10:06 -0800 |
| commit | 8d272bb15d3bb20b541da9f675bc5738cdfc2484 (patch) | |
| tree | 4cb9a79488f1ce477a1d6c837bca532fe3d89bac /java/com/android/dialer/searchfragment/common | |
| parent | 5f85a77502dc62c68103dfb998157d7b066d54d3 (diff) | |
Search now supports alternative sort and display orders for contact names.
This means that names like "Bob Dylan" can be displayed as "Dylan, Bob" and
the names are now able to be sorted by last name as well.
This change also adds content descriptions to search icon for a11y.
Bug: 68293751
Test: NewSearchFragmentTest
PiperOrigin-RevId: 176382228
Change-Id: I5b2b0f3f3f1e2f23ea6b745fd809adfb0ba6242c
Diffstat (limited to 'java/com/android/dialer/searchfragment/common')
| -rw-r--r-- | java/com/android/dialer/searchfragment/common/Projections.java | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/java/com/android/dialer/searchfragment/common/Projections.java b/java/com/android/dialer/searchfragment/common/Projections.java index 63fac4ca0..cebe5c9a9 100644 --- a/java/com/android/dialer/searchfragment/common/Projections.java +++ b/java/com/android/dialer/searchfragment/common/Projections.java @@ -39,8 +39,10 @@ public class Projections { @SuppressWarnings("unused") public static final int SORT_KEY = 11; - public static final int COMPANY_NAME = 12; - public static final int NICKNAME = 13; + public static final int SORT_ALTERNATIVE = 12; + + public static final int COMPANY_NAME = 13; + public static final int NICKNAME = 14; public static final String[] CP2_PROJECTION = new String[] { @@ -56,8 +58,29 @@ public class Projections { Data.CONTACT_ID, // 9 Data.MIMETYPE, // 10 Data.SORT_KEY_PRIMARY, // 11 - Organization.COMPANY, // 12 - Nickname.NAME // 13 + Data.SORT_KEY_ALTERNATIVE, // 12 + Organization.COMPANY, // 13 + Nickname.NAME // 14 + }; + + // Uses alternative display names (i.e. "Bob Dylan" becomes "Dylan, Bob"). + public static final String[] CP2_PROJECTION_ALTERNATIVE = + new String[] { + Data._ID, // 0 + Phone.TYPE, // 1 + Phone.LABEL, // 2 + Phone.NUMBER, // 3 + Data.DISPLAY_NAME_ALTERNATIVE, // 4 + Data.PHOTO_ID, // 5 + Data.PHOTO_THUMBNAIL_URI, // 6 + Data.LOOKUP_KEY, // 7 + Data.CARRIER_PRESENCE, // 8 + Data.CONTACT_ID, // 9 + Data.MIMETYPE, // 10 + Data.SORT_KEY_PRIMARY, // 11 + Data.SORT_KEY_ALTERNATIVE, // 12 + Organization.COMPANY, // 13 + Nickname.NAME // 14 }; public static final String[] DATA_PROJECTION = |