am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.
This commit is contained in:
Filip Gruszczynski
2014-12-08 19:33:55 +00:00
committed by Android Git Automerger

View File

@@ -615,8 +615,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
mOverscanInsets.set(Math.max(mOverscanFrame.left - mFrame.left, 0),
Math.max(mOverscanFrame.top - mFrame.top, 0),
Math.max(mFrame.right - mOverscanFrame.right, 0),
Math.max(mFrame.bottom - mOverscanFrame.bottom, 0));
Math.min(mFrame.right - mOverscanFrame.right, 0),
Math.min(mFrame.bottom - mOverscanFrame.bottom, 0));
mContentInsets.set(mContentFrame.left - mFrame.left,
mContentFrame.top - mFrame.top,