Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7452d292: Merge change 24086 into eclair

Browse Source 
Merge commit '7452d292599b6ce3b13a52d13e514beac937838a' into eclair-plus-aosp

* commit '7452d292599b6ce3b13a52d13e514beac937838a':
  Fixing asymmetry between phone filter and email filter APIs.
This commit is contained in:
Dmitri Plotnikov
2009-09-08 13:42:11 -07:00
committed by Android Git Automerger
parent 04cae64ed1 7452d29259
commit 8544a34983
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/provider/ContactsContract.java
View File

@@ -999,10 +999,10 @@ public final class ContactsContract {
"phones");
/**
* The content:// style URI for filtering data records of the
* {@link Phone#CONTENT_ITEM_TYPE} MIME type, combined with the
* associated raw contact and aggregate contact data. The filter argument should
* be passed as an additional path segment after this URI.
* The content:// style URL for phone lookup using a filter. The filter returns
* records of MIME type {@link Phone#CONTENT_ITEM_TYPE}. The filter is applied
* to display names as well as phone numbers. The filter argument should be passed
* as an additional path segment after this URI.
*/
public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(CONTENT_URI,
"filter");
@@ -1078,11 +1078,23 @@ public final class ContactsContract {
"emails");
/**
* The content:// style URL for filtering data rows by email address. The
* filter argument should be passed as an additional path segment after
* this URI.
* The content:// style URL for looking up data rows by email address. The
* lookup argument, an email address, should be passed as an additional path segment
* after this URI.
*/
public static final Uri CONTENT_FILTER_EMAIL_URI = Uri.withAppendedPath(CONTENT_URI,
public static final Uri CONTENT_LOOKUP_URI = Uri.withAppendedPath(CONTENT_URI,
"lookup");
@Deprecated
public static final Uri CONTENT_FILTER_EMAIL_URI = CONTENT_LOOKUP_URI;
/**
* The content:// style URL for email lookup using a filter. The filter returns
* records of MIME type {@link Email#CONTENT_ITEM_TYPE}. The filter is applied
* to display names as well as email addresses. The filter argument should be passed
* as an additional path segment after this URI.
*/
public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(CONTENT_URI,
"filter");
public static final int TYPE_HOME = 1;