Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325

am: ea84ad75d3

* commit 'ea84ad75d3e5f9244238c32154cffaab21bda58a':
  Fix surfaceInset adjustment.

Change-Id: I37b96b4a773e9f53bd143fc1f55a9f633794f8b2
This commit is contained in:
Robert Carr
2016-05-12 19:04:32 +00:00
committed by android-build-merger

View File

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