Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 06b3b0bd: am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev

Browse Source 
* commit '06b3b0bd0c5220abd6563c276711e21e353c1320':
  docs: fix markup error bug: 7456071
This commit is contained in:
Scott Main
2012-11-05 14:15:33 -08:00
committed by Android Git Automerger
parent e7610cd3d3 06b3b0bd0c
commit fccddd2965
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/app/Presentation.java
View File

@@ -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 * 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()}. * presentation display using {@link android.media.MediaRouter.RouteInfo#getPresentationDisplay()}.
* </p> * </p>
* {@samplecode * <pre>
* MediaRouter mediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); * MediaRouter mediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
* MediaRouter.RouteInfo route = mediaRouter.getSelectedRoute(); * MediaRouter.RouteInfo route = mediaRouter.getSelectedRoute();
* if (route != null) $&#123; * if (route != null) {
* Display presentationDisplay = route.getPresentationDisplay(); * Display presentationDisplay = route.getPresentationDisplay();
* if (presentationDisplay != null) $&#123; * if (presentationDisplay != null) {
* Presentation presentation = new MyPresentation(context, presentationDisplay); * Presentation presentation = new MyPresentation(context, presentationDisplay);
* presentation.show(); * presentation.show();
* $&#125; * }
* $&#125; * }</pre>
* }
* <p> * <p>
* The following sample code from <code>ApiDemos</code> demonstrates how to use the media * 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 * 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#getDisplays(String)} and the
* {@link DisplayManager#DISPLAY_CATEGORY_PRESENTATION} category. * {@link DisplayManager#DISPLAY_CATEGORY_PRESENTATION} category.
* </p> * </p>
* {@samplecode * <pre>
* DisplayManager displayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); * DisplayManager displayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
* Display[] presentationDisplays = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION); * Display[] presentationDisplays = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
* if (presentationDisplays.length > 0) $&#123; * if (presentationDisplays.length > 0) {
* // If there is more than one suitable presentation display, then we could consider * // 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 * // 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. * // which is the one the system recommends as the preferred presentation display.
* Display display = presentationDisplays[0]; * Display display = presentationDisplays[0];
* Presentation presentation = new MyPresentation(context, presentationDisplay); * Presentation presentation = new MyPresentation(context, presentationDisplay);
* presentation.show(); * presentation.show();
* $&#125; * }</pre>
* }
* <p> * <p>
* The following sample code from <code>ApiDemos</code> demonstrates how to use the display * 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 * manager to enumerate displays and show content on multiple presentation displays