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

Commit 976f28b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't crop windows not on defualt display to stack bounds." into nyc-dev

parents 6ed4e35e 4c5aa517

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

+3 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,9 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                if (stack != null) {

                    pw.print(" stackId="); pw.print(stack.mStackId);

                }

                if (mNotOnAppsDisplay) {

                    pw.print(" mNotOnAppsDisplay="); pw.print(mNotOnAppsDisplay);

                }

                pw.print(" mSession="); pw.print(mSession);

                pw.print(" mClient="); pw.println(mClient.asBinder());

        pw.print(prefix); pw.print("mOwnerUid="); pw.print(mOwnerUid);

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

+11 −0
Original line number Diff line number Diff line
@@ -1290,6 +1290,17 @@ class WindowStateAnimator { 
    }

    private void adjustCropToStackBounds(WindowState w, Rect clipRect, Rect finalClipRect,

            boolean isFreeformResizing) {



        final DisplayContent displayContent = w.getDisplayContent();

        if (displayContent != null && !displayContent.isDefaultDisplay) {

            // There are some windows that live on other displays while their app and main window

            // live on the default display (e.g. casting...). We don't want to crop this windows

            // to the stack bounds which is only currently supported on the default display.

            // TODO(multi-display): Need to support cropping to stack bounds on other displays

            // when we have stacks on other displays.

            return;

        }



        final Task task = w.getTask();

        if (task == null || !task.cropWindowsToStackBounds()) {

            return;