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

Commit 61c11206 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix content insets calculation error when taking task snapshot." am:... 

Merge "Fix content insets calculation error when taking task snapshot." am: fe0504b2 am: 6f82d999 am: e8186437 am: f2b76be6

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

Change-Id: Icb9d809c8c1ea77ff70c56b3dc364fe14783c7b1
parents ba93e7f5 f2b76be6

services/core/java/com/android/server/wm/TaskSnapshotController.java

+2 −2
Original line number Diff line number Diff line
@@ -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);