diff options
| author | Tiger Huang <tigerhuang@google.com> | 2021-12-24 10:14:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-24 10:14:06 +0000 |
| commit | 96278acd8eab05f5d2b609f0d956191b540995bf (patch) | |
| tree | 75f87c926de9904ff311909d46df03c5adf118d2 /core/java | |
| parent | d3f6ae617ea4c7bc153e17f588b13772b1124c0b (diff) | |
| parent | 67f269a89ec9c630895e2f3c546217a40c6294a6 (diff) | |
Merge "Move tests from DisplayPolicyLayoutTests to WindowLayoutTests"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowLayout.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index c37120220f1a..af496dcea8e3 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1141,7 +1141,7 @@ public final class ViewRootImpl implements ViewParent, final Rect displayCutoutSafe = mTempRect; state.getDisplayCutoutSafe(displayCutoutSafe); final WindowConfiguration winConfig = getConfiguration().windowConfiguration; - mWindowLayout.computeWindowFrames(mWindowAttributes, state, + mWindowLayout.computeFrames(mWindowAttributes, state, displayCutoutSafe, winConfig.getBounds(), winConfig.getWindowingMode(), UNSPECIFIED_LENGTH, UNSPECIFIED_LENGTH, mInsetsController.getRequestedVisibilities(), diff --git a/core/java/android/view/WindowLayout.java b/core/java/android/view/WindowLayout.java index 7dfc95ef0302..e5c7d6db37a9 100644 --- a/core/java/android/view/WindowLayout.java +++ b/core/java/android/view/WindowLayout.java @@ -52,7 +52,7 @@ public class WindowLayout { private final Rect mTempDisplayCutoutSafeExceptMaybeBarsRect = new Rect(); private final Rect mTempRect = new Rect(); - public boolean computeWindowFrames(WindowManager.LayoutParams attrs, InsetsState state, + public boolean computeFrames(WindowManager.LayoutParams attrs, InsetsState state, Rect displayCutoutSafe, Rect windowBounds, @WindowingMode int windowingMode, int requestedWidth, int requestedHeight, InsetsVisibilities requestedVisibilities, Rect attachedWindowFrame, float compatScale, Rect outDisplayFrame, Rect outParentFrame, |