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

Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-10-16 18:58:58 -07:00
committed by Android (Google) Code Review
parent e4728b15cb 341220fd09
commit e13ae64850
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/java/com/android/server/wm/WindowState.java
View File

@@ -1038,18 +1038,26 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
boolean isHiddenFromUserLocked() {
// Save some cycles by not calling getDisplayInfo unless it is an application
// window intended for all users.
if (mAttrs.type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW
&& mAppToken != null && mAppToken.showWhenLocked) {
final DisplayInfo displayInfo = mDisplayContent.getDisplayInfo();
if (isFullscreen(displayInfo.appWidth, displayInfo.appHeight)) {
// Attached windows are evaluated based on the window that they are attached to.
WindowState win = this;
while (win.mAttachedWindow != null) {
win = win.mAttachedWindow;
}
if (win.mAttrs.type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW
&& win.mAppToken != null && win.mAppToken.showWhenLocked) {
// Save some cycles by not calling getDisplayInfo unless it is an application
// window intended for all users.
final DisplayInfo displayInfo = win.mDisplayContent.getDisplayInfo();
if (win.mFrame.left <= 0 && win.mFrame.top <= 0
&& win.mFrame.right >= displayInfo.appWidth
&& win.mFrame.bottom >= displayInfo.appHeight) {
// Is a fullscreen window, like the clock alarm. Show to everyone.
return false;
}
}
return mShowToOwnerOnly && UserHandle.getUserId(mOwnerUid) != mService.mCurrentUserId;
return win.mShowToOwnerOnly
&& UserHandle.getUserId(win.mOwnerUid) != mService.mCurrentUserId;
}
private static void applyInsets(Region outRegion, Rect frame, Rect inset) {