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

am b134b203: Merge change Id8c9cb2f into eclair

Browse Source 
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
This commit is contained in:
Dianne Hackborn
2009-10-07 22:07:54 -07:00
committed by Android Git Automerger
parent ec83852a19 b134b2038e
commit 8c815d9ded
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/WindowManagerPolicy.java
View File

@@ -262,6 +262,13 @@ public interface WindowManagerPolicy {
*/ */
boolean isVisibleLw(); boolean isVisibleLw();
/**
* Like {@link #isVisibleLw}, but also counts a window that is currently
* "hidden" behind the keyguard as visible. This allows us to apply
* things like window flags that impact the keyguard.
*/
boolean isVisibleOrBehindKeyguardLw();
/** /**
* Is this window currently visible to the user on-screen? It is * Is this window currently visible to the user on-screen? It is
* displayed either if it is visible or it is currently running an * displayed either if it is visible or it is currently running an

15
services/java/com/android/server/WindowManagerService.java
View File

@@ -7573,6 +7573,21 @@ public class WindowManagerService extends IWindowManager.Stub
&& !mExiting && !mDestroying; && !mExiting && !mDestroying;
} }
/**
* Like {@link #isVisibleLw}, but also counts a window that is currently
* "hidden" behind the keyguard as visible. This allows us to apply
* things like window flags that impact the keyguard.
* XXX I am starting to think we need to have ANOTHER visibility flag
* for this "hidden behind keyguard" state rather than overloading
* mPolicyVisibility. Ungh.
*/
public boolean isVisibleOrBehindKeyguardLw() {
final AppWindowToken atoken = mAppToken;
return mSurface != null && !mAttachedHidden
&& (atoken == null ? mPolicyVisibility : !atoken.hiddenRequested)
&& !mExiting && !mDestroying;
}
/** /**
* Is this window visible, ignoring its app token? It is not visible * Is this window visible, ignoring its app token? It is not visible
* if there is no surface, or we are in the process of running an exit animation * if there is no surface, or we are in the process of running an exit animation