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

Merge "Preserve letterbox while dragResizing" into pi-dev

Browse Source
This commit is contained in:
Adrian Roos
2018-03-21 17:33:27 +00:00
committed by Android (Google) Code Review
parent 38e09dd7e1 f93b6d2717
commit 2dae40bfe6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -1482,11 +1482,13 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
void layoutLetterbox(WindowState winHint) {
final WindowState w = findMainWindow();
if (w != winHint && winHint != null && w != null) {
if (w == null || winHint != null && w != winHint) {
return;
}
final boolean needsLetterbox = w != null && w.isLetterboxedAppWindow()
&& fillsParent() && w.hasDrawnLw();
final boolean surfaceReady = w.hasDrawnLw() // Regular case
|| w.mWinAnimator.mSurfaceDestroyDeferred // The preserved surface is still ready.
|| w.isDragResizeChanged(); // Waiting for relayoutWindow to call preserveSurface.
final boolean needsLetterbox = w.isLetterboxedAppWindow() && fillsParent() && surfaceReady;
if (needsLetterbox) {
if (mLetterbox == null) {
mLetterbox = new Letterbox(() -> makeChildSurface(null));