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

Commit 940edc7a authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Don't crop freeform windows by policy" into qt-dev

parents db2b921a 1c66f44c

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -805,7 +805,12 @@ public class TaskStack extends WindowContainer<Task> implements 
        if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {

        if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {

            return;

            return;

        }

        }

        if (getWindowConfiguration().tasksAreFloating()) {

            // Don't crop freeform windows to the stack.

            transaction.setWindowCrop(mSurfaceControl, -1, -1);

        } else {

            transaction.setWindowCrop(mSurfaceControl, width, height);

            transaction.setWindowCrop(mSurfaceControl, width, height);

        }

        mLastSurfaceSize.set(width, height);

        mLastSurfaceSize.set(width, height);

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,7 @@ class WindowStateAnimator { 
            return false;

            return false;

        }

        }





        if (w.inPinnedWindowingMode()) {

        if (w.getWindowConfiguration().tasksAreFloating()) {

            return false;

            return false;

        }

        }