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

Merge "Fix layout for child windows" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-04-25 19:29:39 +00:00
committed by Android (Google) Code Review
parent 955009f9d3 5f23a57707
commit 17178d95f2
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON; import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;
import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND; import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED; import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
@@ -2613,7 +2614,17 @@ final class WindowState implements WindowManagerPolicy.WindowState {
final int ph = containingFrame.height(); final int ph = containingFrame.height();
final Task task = getTask(); final Task task = getTask();
final boolean nonFullscreenTask = isInMultiWindowMode(); final boolean nonFullscreenTask = isInMultiWindowMode();
final boolean fitToDisplay = (task == null || !nonFullscreenTask) && !layoutInParentFrame(); final boolean noLimits = (mAttrs.flags & FLAG_LAYOUT_NO_LIMITS) != 0;
// We need to fit it to the display if either
// a) The task is fullscreen, or we don't have a task (we assume fullscreen for the taskless
// windows)
// b) If it's a child window, we also need to fit it to the display unless
// FLAG_LAYOUT_NO_LIMITS is set. This is so we place Popup and similar windows on screen,
// but SurfaceViews want to be always at a specific location so we don't fit it to the
// display.
final boolean fitToDisplay = (task == null || !nonFullscreenTask)
|| (isChildWindow() && !noLimits);
float x, y; float x, y;
int w,h; int w,h;