From aaf1811dda607f10ab0f0ae80fd2b2b7cf9d0069 Mon Sep 17 00:00:00 2001 From: Filip Gruszczynski Date: Fri, 5 Jun 2015 13:37:40 -0700 Subject: Calculate outsets before window frame adjustment. Bug: 21635628 Change-Id: I2d818e6d543c885dca2d19553bad5ce1adda95a6 --- .../core/java/com/android/server/wm/WindowState.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'services') diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 9b3bc6c..dff79a8 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -627,6 +627,16 @@ final class WindowState implements WindowManagerPolicy.WindowState { // Now make sure the window fits in the overall display. Gravity.applyDisplay(mAttrs.gravity, df, mFrame); + // Calculate the outsets before the content frame gets shrinked to the window frame. + if (hasOutsets) { + mOutsets.set(Math.max(mContentFrame.left - mOutsetFrame.left, 0), + Math.max(mContentFrame.top - mOutsetFrame.top, 0), + Math.max(mOutsetFrame.right - mContentFrame.right, 0), + Math.max(mOutsetFrame.bottom - mContentFrame.bottom, 0)); + } else { + mOutsets.set(0, 0, 0, 0); + } + // Make sure the content and visible frames are inside of the // final window frame. mContentFrame.set(Math.max(mContentFrame.left, mFrame.left), @@ -664,15 +674,6 @@ final class WindowState implements WindowManagerPolicy.WindowState { Math.max(mFrame.right - mStableFrame.right, 0), Math.max(mFrame.bottom - mStableFrame.bottom, 0)); - if (hasOutsets) { - mOutsets.set(Math.max(mContentFrame.left - mOutsetFrame.left, 0), - Math.max(mContentFrame.top - mOutsetFrame.top, 0), - Math.max(mOutsetFrame.right - mContentFrame.right, 0), - Math.max(mOutsetFrame.bottom - mContentFrame.bottom, 0)); - } else { - mOutsets.set(0, 0, 0, 0); - } - mCompatFrame.set(mFrame); if (mEnforceSizeCompat) { // If there is a size compatibility scale being applied to the -- cgit v1.1