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

Commit 48e85477 authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

Merge "Don't crop freeform windows by policy" into qt-dev am: 940edc7a 

am: 8e6518f3

Change-Id: I0864d855085ba485a08f5a6ed23ef856d5a2a7a8
parents 22df6bdc 8e6518f3

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

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

            return;

        }

        if (getWindowConfiguration().tasksAreFloating()) {

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

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

        } else {

            transaction.setWindowCrop(mSurfaceControl, width, height);

        }

        mLastSurfaceSize.set(width, height);

    }

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

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

        }



        if (w.inPinnedWindowingMode()) {

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

            return false;

        }