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."

Browse Source
This commit is contained in:
Tiger Huang
2022-02-22 08:31:31 +00:00
committed by Gerrit Code Review
parent bd8fb4581e 80159d3ed2
commit fe0504b2a9
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

@@ -288,7 +288,7 @@ class TaskSnapshotController {
} }
final ActivityRecord activity = result.first; final ActivityRecord activity = result.first;
final WindowState mainWindow = result.second; final WindowState mainWindow = result.second;
final Rect contentInsets = getSystemBarInsets(task.getBounds(), final Rect contentInsets = getSystemBarInsets(mainWindow.getFrame(),
mainWindow.getInsetsStateWithVisibilityOverride()); mainWindow.getInsetsStateWithVisibilityOverride());
InsetUtils.addInsets(contentInsets, activity.getLetterboxInsets()); InsetUtils.addInsets(contentInsets, activity.getLetterboxInsets());
@@ -554,7 +554,7 @@ class TaskSnapshotController {
final LayoutParams attrs = mainWindow.getAttrs(); final LayoutParams attrs = mainWindow.getAttrs();
final Rect taskBounds = task.getBounds(); final Rect taskBounds = task.getBounds();
final InsetsState insetsState = mainWindow.getInsetsStateWithVisibilityOverride(); 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, final SystemBarBackgroundPainter decorPainter = new SystemBarBackgroundPainter(attrs.flags,
attrs.privateFlags, attrs.insetsFlags.appearance, task.getTaskDescription(), attrs.privateFlags, attrs.insetsFlags.appearance, task.getTaskDescription(),
mHighResTaskSnapshotScale, insetsState); mHighResTaskSnapshotScale, insetsState);