Skip to content

Commit f2eb2e3

Browse files
Jeff BrownAndroid (Google) Code Review
authored andcommitted
Merge "Fix javadoc." into jb-mr1-dev
2 parents b4544d6 + a95a3b4 commit f2eb2e3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

core/java/android/app/Presentation.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,26 @@
3232

3333
/**
3434
* Base class for presentations.
35-
*
35+
* <p>
3636
* A presentation is a special kind of dialog whose purpose is to present
3737
* content on a secondary display. A {@link Presentation} is associated with
3838
* the target {@link Display} at creation time and configures its context and
3939
* resource configuration according to the display's metrics.
40-
*
40+
* </p><p>
4141
* Notably, the {@link Context} of a presentation is different from the context
4242
* of its containing {@link Activity}. It is important to inflate the layout
4343
* of a presentation and load other resources using the presentation's own context
4444
* to ensure that assets of the correct size and density for the target display
4545
* are loaded.
46-
*
46+
* </p><p>
4747
* A presentation is automatically canceled (see {@link Dialog#cancel()}) when
4848
* the display to which it is attached is removed. An activity should take
4949
* care of pausing and resuming whatever content is playing within the presentation
50-
* whenever the activity itself is paused or resume.
50+
* whenever the activity itself is paused or resumed.
51+
* </p>
5152
*
52-
* @see {@link DisplayManager} for information on how to enumerate displays.
53+
* @see DisplayManager for information on how to enumerate displays and receive
54+
* notifications when displays are added or removed.
5355
*/
5456
public class Presentation extends Dialog {
5557
private static final String TAG = "Presentation";

0 commit comments

Comments
 (0)