diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-02-26 20:19:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 20:19:20 +0000 |
| commit | 32e819131bc4952d73f830d6580788609dc6af09 (patch) | |
| tree | e36f33ff7b4125d7e33a9b9e04b01ec1e02f1ee2 /api | |
| parent | bd4b5b7fd0c5f7a2ec82ea130922541626dcc0fd (diff) | |
| parent | 7035f2be61ecf70eea78c147c84fd50c893d107a (diff) | |
| download | frameworks_base-32e819131bc4952d73f830d6580788609dc6af09.zip frameworks_base-32e819131bc4952d73f830d6580788609dc6af09.tar.gz frameworks_base-32e819131bc4952d73f830d6580788609dc6af09.tar.bz2 | |
Merge "QuickContacts can prioritize phone mimetype. Part1"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 676a1cd..3d12275 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25050,9 +25050,12 @@ package android.provider { ctor public ContactsContract.QuickContact(); method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]); method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[]); + method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, java.lang.String[], java.lang.String); + method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, java.lang.String[], java.lang.String); field public static final java.lang.String ACTION_QUICK_CONTACT = "android.provider.action.QUICK_CONTACT"; field public static final java.lang.String EXTRA_EXCLUDE_MIMES = "android.provider.extra.EXCLUDE_MIMES"; field public static final java.lang.String EXTRA_MODE = "android.provider.extra.MODE"; + field public static final java.lang.String EXTRA_PRIORITIZED_MIMETYPE = "android.provider.extra.PRIORITIZED_MIMETYPE"; field public static final int MODE_LARGE = 3; // 0x3 field public static final int MODE_MEDIUM = 2; // 0x2 field public static final int MODE_SMALL = 1; // 0x1 @@ -38753,6 +38756,7 @@ package android.widget { method public void setImageToDefault(); method public void setMode(int); method public void setOverlay(android.graphics.drawable.Drawable); + method public void setPrioritizedMimeType(java.lang.String); field protected java.lang.String[] mExcludeMimes; } diff --git a/api/system-current.txt b/api/system-current.txt index 95e57c4..71a991a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26649,9 +26649,12 @@ package android.provider { ctor public ContactsContract.QuickContact(); method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]); method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[]); + method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, java.lang.String[], java.lang.String); + method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, java.lang.String[], java.lang.String); field public static final java.lang.String ACTION_QUICK_CONTACT = "android.provider.action.QUICK_CONTACT"; field public static final java.lang.String EXTRA_EXCLUDE_MIMES = "android.provider.extra.EXCLUDE_MIMES"; field public static final java.lang.String EXTRA_MODE = "android.provider.extra.MODE"; + field public static final java.lang.String EXTRA_PRIORITIZED_MIMETYPE = "android.provider.extra.PRIORITIZED_MIMETYPE"; field public static final int MODE_LARGE = 3; // 0x3 field public static final int MODE_MEDIUM = 2; // 0x2 field public static final int MODE_SMALL = 1; // 0x1 @@ -41212,6 +41215,7 @@ package android.widget { method public void setImageToDefault(); method public void setMode(int); method public void setOverlay(android.graphics.drawable.Drawable); + method public void setPrioritizedMimeType(java.lang.String); field protected java.lang.String[] mExcludeMimes; } |