diff options
| author | Makoto Onuki <omakoto@google.com> | 2012-06-16 12:34:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-16 12:34:56 -0700 |
| commit | c4637d3efbbeb3e204691da96c357b5fea4ae2f1 (patch) | |
| tree | a2e1e8ff53738bbc1377d6ade269508103857668 | |
| parent | 130b4572d1f3df702e5b296a655d15a41f6d4c66 (diff) | |
| parent | 1024de59618d6217beac1fc47866baa3741cc27d (diff) | |
| download | frameworks_base-c4637d3efbbeb3e204691da96c357b5fea4ae2f1.zip frameworks_base-c4637d3efbbeb3e204691da96c357b5fea4ae2f1.tar.gz frameworks_base-c4637d3efbbeb3e204691da96c357b5fea4ae2f1.tar.bz2 | |
Merge "Allow restricting the scope of a phone-filter search" into jb-dev
| -rw-r--r-- | api/16.txt | 6 | ||||
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 14 |
3 files changed, 20 insertions, 2 deletions
@@ -11566,6 +11566,8 @@ package android.media { method public java.lang.CharSequence getName(android.content.Context); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); + method public java.lang.Object getTag(); + method public void setTag(java.lang.Object); } public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback { @@ -11580,14 +11582,12 @@ package android.media { } public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { - method public java.lang.Object getTag(); method public void setIconDrawable(android.graphics.drawable.Drawable); method public void setIconResource(int); method public void setName(java.lang.CharSequence); method public void setName(int); method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); - method public void setTag(java.lang.Object); } public class MediaScannerConnection implements android.content.ServiceConnection { @@ -17372,6 +17372,8 @@ package android.provider { 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 java.lang.String SEARCH_DISPLAY_NAME_KEY = "search_display_name"; + field public static final java.lang.String SEARCH_PHONE_NUMBER_KEY = "search_phone_number"; field public static final int TYPE_ASSISTANT = 19; // 0x13 field public static final int TYPE_CALLBACK = 8; // 0x8 field public static final int TYPE_CAR = 9; // 0x9 diff --git a/api/current.txt b/api/current.txt index 12f032e..0f1d68e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17372,6 +17372,8 @@ package android.provider { 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 java.lang.String SEARCH_DISPLAY_NAME_KEY = "search_display_name"; + field public static final java.lang.String SEARCH_PHONE_NUMBER_KEY = "search_phone_number"; field public static final int TYPE_ASSISTANT = 19; // 0x13 field public static final int TYPE_CALLBACK = 8; // 0x8 field public static final int TYPE_CAR = 9; // 0x9 diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index e8f87bb..8e123ac 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5416,6 +5416,20 @@ public final class ContactsContract { public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(CONTENT_URI, "filter"); + /** + * A boolean query parameter that can be used with {@link #CONTENT_FILTER_URI}. + * If "1" or "true", display names are searched. If "0" or "false", display names + * are not searched. Default is "1". + */ + public static final String SEARCH_DISPLAY_NAME_KEY = "search_display_name"; + + /** + * A boolean query parameter that can be used with {@link #CONTENT_FILTER_URI}. + * If "1" or "true", phone numbers are searched. If "0" or "false", phone numbers + * are not searched. Default is "1". + */ + public static final String SEARCH_PHONE_NUMBER_KEY = "search_phone_number"; + public static final int TYPE_HOME = 1; public static final int TYPE_MOBILE = 2; public static final int TYPE_WORK = 3; |