Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e61711c authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

Merge "Calculate letterbox against task displayed-bounds in multi-window" into...

Merge "Calculate letterbox against task displayed-bounds in multi-window" into qt-dev am: 267730ef
am: eebd5232

Change-Id: If5c45373fbb3deab4c6f1c2c5da6ec56f0947d16
parents f218b1a3 eebd5232
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -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();