Merge "Do not adjust child windows placement for fit to display." into nyc-dev

2016-03-24 19:08:40 +00:00
parent 90b6454cb3 3d93897a56
commit 157fea650b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2528,7 +2528,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
        final int ph = mContainingFrame.height();
        final Task task = getTask();
        final boolean nonFullscreenTask = inMultiWindowMode();
-        final boolean fitToDisplay = task != null && !task.isFloating();
+        final boolean fitToDisplay = task != null && !task.isFloating() && !layoutInParentFrame();
        float x, y;
        int w,h;