am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev (df6d3eeb) · Commits · e / os / android_frameworks_base

api/16.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -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

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

core/java/android/provider/ContactsContract.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -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;