diff options
| author | 2016-05-12 18:57:57 +0000 | |
|---|---|---|
| committer | 2016-05-12 18:57:58 +0000 | |
| commit | 663330a325c4b324eb19cdb4f83189f342e01060 (patch) | |
| tree | cec692d11bd7f81a60a7aefc1e4c2dfae14187c8 | |
| parent | 8363a70024a53f4934639a1e6c13aae17f4d6d0c (diff) | |
| parent | 9848c84d026186aa9a186d4587b615aae06a2ef6 (diff) | |
Merge "Fix surfaceInset adjustment." into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 9e66c28b5629..5678ad9e1e86 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -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() { |