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

Merge "Fix regression breaking SurfaceView in docked." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-04-07 23:17:11 +00:00
committed by Android (Google) Code Review
parent f89c01254f fd2bd1b343
commit 846c3f4fdc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,8 +734,10 @@ final class WindowState implements WindowManagerPolicy.WindowState {
layoutYDiff = !mInsetFrame.isEmpty() ? mInsetFrame.top - mContainingFrame.top : 0;
layoutContainingFrame = !mInsetFrame.isEmpty() ? mInsetFrame : mContainingFrame;
subtractInsets(mDisplayFrame, layoutContainingFrame, df);
subtractInsets(mContainingFrame, layoutContainingFrame, pf);
subtractInsets(mInsetFrame, layoutContainingFrame, pf);
if (!layoutInParentFrame()) {
subtractInsets(mContainingFrame, layoutContainingFrame, pf);
subtractInsets(mInsetFrame, layoutContainingFrame, pf);
}
layoutDisplayFrame = df;
layoutDisplayFrame.intersect(layoutContainingFrame);
}