am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev (7c6863be) · Commits · e / os / android_frameworks_base

core/java/android/app/Presentation.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -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