Merge "Allow restricting the scope of a phone-filter search" into jb-dev
diff --git a/api/16.txt b/api/16.txt
index a1ba90c..e67292e 100644
--- a/api/16.txt
+++ b/api/16.txt
@@ -11566,6 +11566,8 @@
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 @@
}
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 @@
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 @@
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 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;