am 87427ce5: am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev

* commit '87427ce5035e860b5d90e8a1788ee44e31bec504':
  Revert "Fix calculation of overscan insets in WindowState."
This commit is contained in:
Adrian Roos
2014-12-09 18:48:16 +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.min(mFrame.right - mOverscanFrame.right, 0),
Math.min(mFrame.bottom - mOverscanFrame.bottom, 0));
Math.max(mFrame.right - mOverscanFrame.right, 0),
Math.max(mFrame.bottom - mOverscanFrame.bottom, 0));
mContentInsets.set(mContentFrame.left - mFrame.left,
mContentFrame.top - mFrame.top,