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

Commit aee0d50e authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Do not constrain width/height of child windows at layout." into nyc-dev 

am: e15fb017

* commit 'e15fb017':
  Do not constrain width/height of child windows at layout.

Change-Id: I46b9ba59b89a1fa2ed2bd4d75ac399ff337924e2
parents 934dfddf e15fb017

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

+1 −1
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            y = mAttrs.y;

        }



        if (nonFullscreenTask) {

        if (nonFullscreenTask && !layoutInParentFrame()) {

            // Make sure window fits in containing frame since it is in a non-fullscreen task as

            // required by {@link Gravity#apply} call.

            w = Math.min(w, pw);