diff options
| author | Scott Main <smain@google.com> | 2012-11-05 11:35:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-05 11:35:24 -0800 |
| commit | 44c4bba2530b430895ef1c72e8ce2712e8ca9f6e (patch) | |
| tree | e0323a184b88d8a6ad013e0d506206c8f9c2df69 /core | |
| parent | 737a20fda62fe9885f74e208ac21a1574c1593f7 (diff) | |
| parent | 9cc531cc26d928c7b53105def0d80647fba1acd7 (diff) | |
| download | frameworks_base-44c4bba2530b430895ef1c72e8ce2712e8ca9f6e.zip frameworks_base-44c4bba2530b430895ef1c72e8ce2712e8ca9f6e.tar.gz frameworks_base-44c4bba2530b430895ef1c72e8ce2712e8ca9f6e.tar.bz2 | |
Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Presentation.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/java/android/app/Presentation.java b/core/java/android/app/Presentation.java index 3e8af60..16a0c57 100644 --- a/core/java/android/app/Presentation.java +++ b/core/java/android/app/Presentation.java @@ -79,17 +79,16 @@ import android.util.TypedValue; * Here's how to use the media router to create and show a presentation on the preferred * presentation display using {@link android.media.MediaRouter.RouteInfo#getPresentationDisplay()}. * </p> - * {@samplecode + * <pre> * MediaRouter mediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); * MediaRouter.RouteInfo route = mediaRouter.getSelectedRoute(); - * if (route != null) ${ + * if (route != null) { * Display presentationDisplay = route.getPresentationDisplay(); - * if (presentationDisplay != null) ${ + * if (presentationDisplay != null) { * Presentation presentation = new MyPresentation(context, presentationDisplay); * presentation.show(); - * $} - * $} - * } + * } + * }</pre> * <p> * The following sample code from <code>ApiDemos</code> demonstrates how to use the media * router to automatically switch between showing content in the main activity and showing @@ -114,18 +113,17 @@ import android.util.TypedValue; * {@link DisplayManager#getDisplays(String)} and the * {@link DisplayManager#DISPLAY_CATEGORY_PRESENTATION} category. * </p> - * {@samplecode + * <pre> * DisplayManager displayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); * Display[] presentationDisplays = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION); - * if (presentationDisplays.length > 0) ${ + * if (presentationDisplays.length > 0) { * // If there is more than one suitable presentation display, then we could consider * // giving the user a choice. For this example, we simply choose the first display * // which is the one the system recommends as the preferred presentation display. * Display display = presentationDisplays[0]; * Presentation presentation = new MyPresentation(context, presentationDisplay); * presentation.show(); - * $} - * } + * }</pre> * <p> * The following sample code from <code>ApiDemos</code> demonstrates how to use the display * manager to enumerate displays and show content on multiple presentation displays |