am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread
Merge commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a'
* commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a':
Fix SDK docs build.
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 2534de7..e3ed91e 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -580,19 +580,20 @@
* If the keyguard is currently active and is secure (requires an
* unlock pattern) than the user will still need to confirm it before
* seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has
- * also been set. */
+ * also been set.
+ */
public static final int FLAG_DISMISS_KEYGUARD = 0x00400000;
/** Window flag: This window corresponds to an immersive activity
* that wishes not to be interrupted with notifications. In general,
- * applications may simply hide the status bar with {@link
- * FLAG_FULLSCREEN} to suppress most notifications, but will still be
- * interrupted by those with
- * {@link android.app.Notification.fullScreenIntent} set (example: an
- * incoming call). Setting {@link FLAG_IMMERSIVE} will suppress the
- * full-screen intent and show the status bar briefly for those
- * important notifications instead. See also
- * {@link android.app.Notification.FLAG_HIGH_PRIORITY}.
+ * applications may simply hide the status bar with
+ * {@link #FLAG_FULLSCREEN} to suppress most notifications, but will
+ * still be interrupted by those with
+ * {@link android.app.Notification#fullScreenIntent fullScreenIntent}
+ * set (example: an incoming call). Setting {@link #FLAG_IMMERSIVE}
+ * will suppress the full-screen intent and show the status bar
+ * briefly for those important notifications instead.
+ * {@see android.app.Notification#FLAG_HIGH_PRIORITY}
*/
public static final int FLAG_IMMERSIVE = 0x00800000;