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

Commit 7194da9c authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Copy insets state for snapshot starting window"

parents 768cbbd3 0fe3b00c

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

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ class TaskSnapshotController { 
        final int color = ColorUtils.setAlphaComponent(

                task.getTaskDescription().getBackgroundColor(), 255);

        final LayoutParams attrs = mainWindow.getAttrs();

        final InsetsState insetsState = mainWindow.getInsetsState();

        final InsetsState insetsState = new InsetsState(mainWindow.getInsetsState());

        mergeInsetsSources(insetsState, mainWindow.getRequestedInsetsState());

        final Rect systemBarInsets = getSystemBarInsets(mainWindow.getFrame(), insetsState);

        final SystemBarBackgroundPainter decorPainter = new SystemBarBackgroundPainter(attrs.flags,

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ class TaskSnapshotSurface implements StartingSurface { 
            task.getBounds(taskBounds);

            currentOrientation = topFullscreenOpaqueWindow.getConfiguration().orientation;

            activityType = activity.getActivityType();

            insetsState = topFullscreenOpaqueWindow.getInsetsState();

            insetsState = new InsetsState(topFullscreenOpaqueWindow.getInsetsState());

            mergeInsetsSources(insetsState, topFullscreenOpaqueWindow.getRequestedInsetsState());

        }

        try {