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

Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-10 00:44:40 +00:00
committed by Android (Google) Code Review
parent c118e62076 7cd4b01af3
commit 21bbc5a775
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

@@ -697,7 +697,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
// The offset from the layout containing frame to the actual containing frame. // The offset from the layout containing frame to the actual containing frame.
final int layoutXDiff; final int layoutXDiff;
final int layoutYDiff; final int layoutYDiff;
if (mInsetFrame.isEmpty() && (fullscreenTask || layoutInParentFrame())) { if (fullscreenTask || layoutInParentFrame()) {
// We use the parent frame as the containing frame for fullscreen and child windows // We use the parent frame as the containing frame for fullscreen and child windows
mContainingFrame.set(pf); mContainingFrame.set(pf);
mDisplayFrame.set(df); mDisplayFrame.set(df);