Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix surfaceInset adjustment." into nyc-dev

Browse Source 
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I648b66bc468cb7d9e48126a69ca44af3c9116614
This commit is contained in:
Robert Carr
2016-05-12 19:01:54 +00:00
committed by android-build-merger
parent e4f6677cbb 663330a325
commit 00c4404576
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowStateAnimator.java
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() {