Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rob Carr
2016-03-24 19:08:40 +00:00
committed by Android (Google) Code Review
parent 90b6454cb3 3d93897a56
commit 157fea650b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2528,7 +2528,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
final int ph = mContainingFrame.height(); final int ph = mContainingFrame.height();
final Task task = getTask(); final Task task = getTask();
final boolean nonFullscreenTask = inMultiWindowMode(); final boolean nonFullscreenTask = inMultiWindowMode();
final boolean fitToDisplay = task != null && !task.isFloating(); final boolean fitToDisplay = task != null && !task.isFloating() && !layoutInParentFrame();
float x, y; float x, y;
int w,h; int w,h;