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 
am: 21bbc5a775

* commit '21bbc5a775ea65318d1250b0406c2573128d285e':
  Fixed bug with pop-up window placement at the bottom in split-screen

Change-Id: I03fa322474eb7884720a0ce4ace38c71d95f06e9
This commit is contained in:
Wale Ogunwale
2016-05-10 00:56:01 +00:00
committed by android-build-merger
parent e7e7a6b2c7 21bbc5a775
commit 73da942b72
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.
final int layoutXDiff;
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
mContainingFrame.set(pf);
mDisplayFrame.set(df);