diff options
| author | Adam Powell <adamp@google.com> | 2012-06-13 14:05:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-13 14:05:24 -0700 |
| commit | 6c14359074ff5a93695ed37083c9178a4ca2d1f1 (patch) | |
| tree | 868fcd983c8101b3f268b14d04370804c5dfb889 /api | |
| parent | cc7baa28f2b584a238ac5f9bf48775f89a4aa0a4 (diff) | |
| parent | 4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f (diff) | |
| download | frameworks_base-6c14359074ff5a93695ed37083c9178a4ca2d1f1.zip frameworks_base-6c14359074ff5a93695ed37083c9178a4ca2d1f1.tar.gz frameworks_base-6c14359074ff5a93695ed37083c9178a4ca2d1f1.tar.bz2 | |
am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
MediaRouter dialog
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index dda280a..cbf000f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3690,6 +3690,7 @@ package android.app { method public int getRouteTypes(); method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); + method public void showDialog(); } public class NativeActivity extends android.app.Activity implements android.view.InputQueue.Callback android.view.SurfaceHolder.Callback2 android.view.ViewTreeObserver.OnGlobalLayoutListener { @@ -11575,11 +11576,13 @@ 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 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 { |