diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-05-14 17:54:31 -0700 |
|---|---|---|
| committer | Suchi Amalapurapu <asuchitra@google.com> | 2009-05-18 10:47:24 -0700 |
| commit | d1a9337380cf9f40f1aa095457b11242d483295d (patch) | |
| tree | efcd6973bca15ace831278f71b25c9923373b085 | |
| parent | 3a00d763dfb22982987e08f4c8751fe68451ed0d (diff) | |
| download | frameworks_base-d1a9337380cf9f40f1aa095457b11242d483295d.zip frameworks_base-d1a9337380cf9f40f1aa095457b11242d483295d.tar.gz frameworks_base-d1a9337380cf9f40f1aa095457b11242d483295d.tar.bz2 | |
Add a new window flag to display a window when keyguard is shown.
| -rw-r--r-- | core/java/android/view/WindowManager.java | 9 | ||||
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index c69c281..72ef0ad 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -466,6 +466,15 @@ public interface WindowManager extends ViewManager { */ public static final int FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000; + /** Window flag: special flag to let windows be shown when the screen + * is locked. This will let application windows take precedence over + * key guard or any other lock screens. Can be used with + * {@link #FLAG_KEEP_SCREEN_ON} to turn screen on and display windows + * directly before showing the key guard window + * + * {@hide} */ + public static final int FLAG_SHOW_WHEN_LOCKED = 0x00080000; + /** Window flag: a special option intended for system dialogs. When * this flag is set, the window will demand focus unconditionally when * it is created. diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 3fa5baf..a04d73a 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -1300,7 +1300,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo mKeyWaiter.handleNewWindowLocked(mCurrentFocus); } } - if (localLOGV) Log.v( TAG, "New client " + client.asBinder() + ": window=" + win); @@ -7732,7 +7731,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo int i; // FIRST LOOP: Perform a layout, if needed. - performLayoutLockedInner(); if (mFxSession == null) { @@ -7752,7 +7750,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo } // SECOND LOOP: Execute animations and update visibility of windows. - boolean orientationChangeComplete = true; Session holdScreen = null; float screenBrightness = -1; |