diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 8 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 72d1b49cd0d7..18734a52bd06 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1441,6 +1441,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } } + @Override + public Rect getBounds() { + // The window bounds are used for layout in screen coordinates. If the token has bounds for + // size compatibility mode, its configuration bounds are app based coordinates which should + // not be used for layout. + return mToken.hasSizeCompatBounds() ? mToken.getBounds() : super.getBounds(); + } + /** Retrieves the current frame of the window that the application sees. */ Rect getFrame() { return mWindowFrames.mFrame; diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index 59894973521d..d10c006831d2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -320,6 +320,11 @@ public class SizeCompatTests extends WindowTestsBase { assertScaled(); // Activity is sandboxed due to size compat mode. assertActivityMaxBoundsSandboxed(); + + final WindowState appWindow = addWindowToActivity(mActivity); + assertTrue(mActivity.hasSizeCompatBounds()); + assertEquals("App window must use size compat bounds for layout in screen space", + mActivity.getBounds(), appWindow.getBounds()); } @Test |