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

am a2650db7: Merge "Fix SDK docs build." into gingerbread

Browse Source 
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp

* commit 'a2650db770e93a9424d6d6948fd31f943f6dac49':
  Fix SDK docs build.
This commit is contained in:
Daniel Sandler
2010-06-17 19:16:28 -07:00
committed by Android Git Automerger
parent 3f704e983e a2650db770
commit fddf19f671
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/view/WindowManager.java
View File

@@ -580,19 +580,20 @@ public interface WindowManager extends ViewManager {
* If the keyguard is currently active and is secure (requires an * If the keyguard is currently active and is secure (requires an
* unlock pattern) than the user will still need to confirm it before * unlock pattern) than the user will still need to confirm it before
* seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has * seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has
* also been set. */ * also been set.
*/
public static final int FLAG_DISMISS_KEYGUARD = 0x00400000; public static final int FLAG_DISMISS_KEYGUARD = 0x00400000;
/** Window flag: This window corresponds to an immersive activity /** Window flag: This window corresponds to an immersive activity
* that wishes not to be interrupted with notifications. In general, * that wishes not to be interrupted with notifications. In general,
* applications may simply hide the status bar with {@link * applications may simply hide the status bar with
* FLAG_FULLSCREEN} to suppress most notifications, but will still be * {@link #FLAG_FULLSCREEN} to suppress most notifications, but will
* interrupted by those with * still be interrupted by those with
* {@link android.app.Notification.fullScreenIntent} set (example: an * {@link android.app.Notification#fullScreenIntent fullScreenIntent}
* incoming call). Setting {@link FLAG_IMMERSIVE} will suppress the * set (example: an incoming call). Setting {@link #FLAG_IMMERSIVE}
* full-screen intent and show the status bar briefly for those * will suppress the full-screen intent and show the status bar
* important notifications instead. See also * briefly for those important notifications instead.
* {@link android.app.Notification.FLAG_HIGH_PRIORITY}. * {@see android.app.Notification#FLAG_HIGH_PRIORITY}
*/ */
public static final int FLAG_IMMERSIVE = 0x00800000; public static final int FLAG_IMMERSIVE = 0x00800000;