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

* commit '456e66749191bc2b6f1acb69a2b86f499a6ca73a':
  Revert "Fix calculation of overscan insets in WindowState."
This commit is contained in:
Adrian Roos
2014-12-09 18:42:56 +00:00
committed by Android Git Automerger

View File

@@ -617,8 +617,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,