diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-09-05 00:29:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 00:29:17 +0000 |
| commit | d5005842348efd0f7e86b67692cf0638a10a7fed (patch) | |
| tree | 60d13bd4385a1a398494ad896197bcec4e69e9e2 /core/java/android/provider | |
| parent | 3d6d6688c2d82a1b80e208fc598702019f27fd42 (diff) | |
| parent | 2c404b1e5dca5377e04c81d20b2e3e1152e4ce73 (diff) | |
| download | frameworks_base-d5005842348efd0f7e86b67692cf0638a10a7fed.zip frameworks_base-d5005842348efd0f7e86b67692cf0638a10a7fed.tar.gz frameworks_base-d5005842348efd0f7e86b67692cf0638a10a7fed.tar.bz2 | |
am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev
* commit '52cd366d9d094af6b8c3b4e91e54d00a88f50cb8':
ContactsContract API changes per API review
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/CallLog.java | 4 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 08209fa..69f687c 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -112,8 +112,8 @@ public class CallLog { * </pre> * </p> */ - public static final String EXTRA_CALL_TYPE_FILTER - = "android.provider.extra.call_type_filter"; + public static final String EXTRA_CALL_TYPE_FILTER = + "android.provider.extra.CALL_TYPE_FILTER"; /** * Content uri used to access call log entries, including voicemail records. You must have diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 27473e3..18a9eb1 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1125,7 +1125,7 @@ public final class ContactsContract { * import android.provider.ContactsContract.Contacts; * * Uri uri = Contacts.CONTENT_URI.buildUpon() - * .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true") + * .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true") * .build(); * Cursor cursor = getContentResolver().query(uri, * new String[] {Contacts.DISPLAY_NAME}, @@ -1140,21 +1140,24 @@ public final class ContactsContract { * </pre> * </p> */ - public static final String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras"; + public static final String EXTRA_ADDRESS_BOOK_INDEX = + "android.provider.extra.ADDRESS_BOOK_INDEX"; /** * The array of address book index titles, which are returned in the * same order as the data in the cursor. * <p>TYPE: String[]</p> */ - public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles"; + public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = + "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES"; /** * The array of group counts for the corresponding group. Contains the same number * of elements as the EXTRA_ADDRESS_BOOK_INDEX_TITLES array. * <p>TYPE: int[]</p> */ - public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts"; + public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = + "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS"; } /** @@ -8111,7 +8114,7 @@ public final class ContactsContract { * for the provided {@link Contacts} entry. */ public static final String ACTION_QUICK_CONTACT = - "com.android.contacts.action.QUICK_CONTACT"; + "android.provider.action.QUICK_CONTACT"; /** * Extra used to specify pivot dialog location in screen coordinates. |