Merge "Fix surfaceInset adjustment." into nyc-dev

am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I9274121cdbd8ea8ed656478b98d6cd4b740834b8
This commit is contained in:
Robert Carr
2016-05-12 19:01:46 +00:00
committed by android-build-merger

View File

@@ -829,8 +829,8 @@ class WindowStateAnimator {
// Adjust for surface insets. // Adjust for surface insets.
mTmpSize.left -= scale * attrs.surfaceInsets.left; mTmpSize.left -= scale * attrs.surfaceInsets.left;
mTmpSize.top -= scale * attrs.surfaceInsets.top; mTmpSize.top -= scale * attrs.surfaceInsets.top;
mTmpSize.right += scale * (attrs.surfaceInsets.left + attrs.surfaceInsets.right); mTmpSize.right += scale * attrs.surfaceInsets.right;
mTmpSize.bottom += scale * (attrs.surfaceInsets.top + attrs.surfaceInsets.bottom); mTmpSize.bottom += scale * attrs.surfaceInsets.bottom;
} }
boolean hasSurface() { boolean hasSurface() {