diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2011-06-17 13:10:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 13:10:40 -0700 |
| commit | 18cc57fb932363f999a71815cbeb4192cba4b468 (patch) | |
| tree | e27d2a174aab917b0eec42d460ae9c8e467f93dd | |
| parent | 79e16da930dee1b13c4fb6b88c0fbcc6c5b537e0 (diff) | |
| parent | e0a8aabd795736f16cae4aa1d2a68b95e2f5b30f (diff) | |
| download | frameworks_base-18cc57fb932363f999a71815cbeb4192cba4b468.zip frameworks_base-18cc57fb932363f999a71815cbeb4192cba4b468.tar.gz frameworks_base-18cc57fb932363f999a71815cbeb4192cba4b468.tar.bz2 | |
Merge "Add API for auto-complete ranking improvement."
| -rw-r--r-- | api/current.txt | 11 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index ee0aa18..d79230e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15267,6 +15267,8 @@ package android.provider { field public static final java.lang.String DIRECTORY_PARAM_KEY = "directory"; field public static final java.lang.String INCLUDE_PROFILE = "include_profile"; field public static final java.lang.String LIMIT_PARAM_KEY = "limit"; + field public static final java.lang.String PRIMARY_ACCOUNT_NAME = "name_for_primary_account"; + field public static final java.lang.String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account"; } public static final class ContactsContract.AggregationExceptions implements android.provider.BaseColumns { @@ -15609,6 +15611,15 @@ package android.provider { protected static abstract interface ContactsContract.DataColumnsWithJoins implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns { } + public static final class ContactsContract.DataUsageFeedback { + ctor public ContactsContract.DataUsageFeedback(); + field public static final android.net.Uri FEEDBACK_URI; + field public static final java.lang.String USAGE_TYPE = "type"; + field public static final java.lang.String USAGE_TYPE_CALL = "call"; + field public static final java.lang.String USAGE_TYPE_LONG_TEXT = "long_text"; + field public static final java.lang.String USAGE_TYPE_SHORT_TEXT = "short_text"; + } + public static final class ContactsContract.Directory implements android.provider.BaseColumns { method public static void notifyDirectoryChange(android.content.ContentResolver); field public static final java.lang.String ACCOUNT_NAME = "accountName"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 1816066..b5a11ab 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -163,14 +163,12 @@ public final class ContactsContract { * obtaining possible recipients, letting the provider know which account is selected during * the composition. The provider may use the "primary account" information to optimize * the search result. - * @hide */ public static final String PRIMARY_ACCOUNT_NAME = "name_for_primary_account"; /** * A query parameter specifing a primary account. This parameter should be used with * {@link #PRIMARY_ACCOUNT_NAME}. See the doc in {@link #PRIMARY_ACCOUNT_NAME}. - * @hide */ public static final String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account"; @@ -6317,7 +6315,6 @@ public final class ContactsContract { * boolean successful = resolver.update(uri, new ContentValues(), null, null) > 0; * </pre> * </p> - * @hide */ public static final class DataUsageFeedback { |