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

Merge "Fix content insets calculation error when taking task snapshot." am: fe0504b2a9 am: 6f82d9993d am: e81864371f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930818

Change-Id: Icf8e64551e19e477d06c17f37c238ed773ec3190
This commit is contained in:
Tiger Huang
2022-02-22 09:45:18 +00:00
committed by Automerger Merge Worker
parent 8d3ba55d3d e81864371f
commit f2b76be628
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/TaskSnapshotController.java
View File

@@ -310,7 +310,7 @@ class TaskSnapshotController {
}
final ActivityRecord activity = result.first;
final WindowState mainWindow = result.second;
final Rect contentInsets = getSystemBarInsets(task.getBounds(),
final Rect contentInsets = getSystemBarInsets(mainWindow.getFrame(),
mainWindow.getInsetsStateWithVisibilityOverride());
final Rect letterboxInsets = activity.getLetterboxInsets();
InsetUtils.addInsets(contentInsets, letterboxInsets);
@@ -575,7 +575,7 @@ class TaskSnapshotController {
final LayoutParams attrs = mainWindow.getAttrs();
final Rect taskBounds = task.getBounds();
final InsetsState insetsState = mainWindow.getInsetsStateWithVisibilityOverride();
final Rect systemBarInsets = getSystemBarInsets(taskBounds, insetsState);
final Rect systemBarInsets = getSystemBarInsets(mainWindow.getFrame(), insetsState);
final SystemBarBackgroundPainter decorPainter = new SystemBarBackgroundPainter(attrs.flags,
attrs.privateFlags, attrs.insetsFlags.appearance, task.getTaskDescription(),
mHighResTaskSnapshotScale, insetsState);