summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-10-07 21:27:43 -0700
committerDianne Hackborn <hackbod@google.com>2009-10-07 21:29:44 -0700
commit2ae4f37c435ae02cf9038216e1dfce0b82d9caab (patch)
tree1f596f62d90efff8645b7cc0e52d520a7c8a8275
parent08b8108e5873a758bb694aa0a64d758153145a76 (diff)
downloadbase-2ae4f37c435ae02cf9038216e1dfce0b82d9caab.tar.gz
More fix #2163209: alarm clock rings but is hidden behind lock screen
Another way we could miss the application's flags is because the system now force hides application windows behind the lock screen. So we need to use this new API to actually take those into account when looking for the top-most window that can specify for the lock screen to be removed or hidden. I have tested with pulling the device in and out of the desktop with all kinds of random speeds and ways and this -seems- to now cover everything. Keeping fingers crossed. Change-Id: Ice640eea6ee06ee27f069d60856fb394c7eeae51
-rwxr-xr-xphone/com/android/internal/policy/impl/PhoneWindowManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index 549fb87..4699638 100755
--- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1359,12 +1359,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
win.computeFrameLw(pf, df, cf, vf);
- if (win.isVisibleLw()) {
+ if (mTopFullscreenOpaqueWindowState == null &&
+ win.isVisibleOrBehindKeyguardLw()) {
if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
mForceStatusBar = true;
}
- if (mTopFullscreenOpaqueWindowState == null
- && attrs.type >= FIRST_APPLICATION_WINDOW
+ if (attrs.type >= FIRST_APPLICATION_WINDOW
&& attrs.type <= LAST_APPLICATION_WINDOW
&& win.fillsScreenLw(mW, mH, false, false)) {
if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);