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

Merge "Fix stuck windows in multi-window" into nyc-dev

Browse Source 
am: 4a96538

* commit '4a9653841b9a011c6c2dc2a841ef21bb501602ad':
  Fix stuck windows in multi-window

Change-Id: I7618c6852b03ca12887fbc9761839b42428b3a50
This commit is contained in:
Jorim Jaggi
2016-04-25 19:48:32 +00:00
committed by android-build-merger
parent ee148e354d 4a9653841b
commit 7be78a1e7b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2067,16 +2067,14 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
if (win.mAttrs.type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW
&& win.mAppToken != null && win.mAppToken.showForAllUsers) {
// Save some cycles by not calling getDisplayInfo unless it is an application
// window intended for all users.
final DisplayContent displayContent = win.getDisplayContent();
if (displayContent == null) {
return true;
}
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
if (win.mFrame.left <= 0 && win.mFrame.top <= 0
&& win.mFrame.right >= displayInfo.appWidth
&& win.mFrame.bottom >= displayInfo.appHeight) {
// All window frames that are fullscreen extend above status bar, but some don't extend
// below navigation bar. Thus, check for display frame for top/left and stable frame for
// bottom right.
if (win.mFrame.left <= win.mDisplayFrame.left
&& win.mFrame.top <= win.mDisplayFrame.top
&& win.mFrame.right >= win.mStableFrame.right
&& win.mFrame.bottom >= win.mStableFrame.bottom) {
// Is a fullscreen window, like the clock alarm. Show to everyone.
return false;
}