diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/AppWindowToken.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index df931956833b..a612799549a2 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -1981,13 +1981,11 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree mLetterbox.attachInput(w); } getPosition(mTmpPoint); - // Get the bounds of the "space-to-fill". We union the Task and the Stack bounds here - // to handle both split window (where task-bounds can be larger) and orientation - // letterbox (where the task is letterboxed within stack). - Rect spaceToFill = getTask().getBounds(); - if (getStack() != null) { - spaceToFill.union(getStack().getBounds()); - } + // Get the bounds of the "space-to-fill". In multi-window mode, the task-level + // represents this. In fullscreen-mode, the stack does (since the orientation letterbox + // is also applied to the task). + Rect spaceToFill = (inMultiWindowMode() || getStack() == null) + ? getTask().getDisplayedBounds() : getStack().getDisplayedBounds(); mLetterbox.layout(spaceToFill, w.getFrameLw(), mTmpPoint); } else if (mLetterbox != null) { mLetterbox.hide(); |