diff options
| author | Rob Carr <racarr@google.com> | 2015-10-15 18:38:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-15 18:38:28 +0000 |
| commit | 575b629ef8e21cca5a40acaafeee7653d90956fe (patch) | |
| tree | 42efeea52f6e96b9ec81c8685e44b12c1321dabd /services | |
| parent | ae5a53d78cac72b73574b874a4d12ae9de708101 (diff) | |
| parent | 38451b824723095967d36445e9be029bf73d4226 (diff) | |
| download | frameworks_base-575b629ef8e21cca5a40acaafeee7653d90956fe.zip frameworks_base-575b629ef8e21cca5a40acaafeee7653d90956fe.tar.gz frameworks_base-575b629ef8e21cca5a40acaafeee7653d90956fe.tar.bz2 | |
Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 726d29d..42042b9 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1064,6 +1064,8 @@ class WindowStateAnimator { mAnimator.getScreenRotationAnimationLocked(displayId); final boolean screenAnimation = screenRotationAnimation != null && screenRotationAnimation.isAnimating(); + + mHasClipRect = false; if (selfTransformation || attachedTransformation != null || appTransformation != null || screenAnimation) { // cache often used attributes locally @@ -1139,7 +1141,6 @@ class WindowStateAnimator { // transforming since it is more important to have that // animation be smooth. mShownAlpha = mAlpha; - mHasClipRect = false; if (!mService.mLimitedAlphaCompositing || (!PixelFormat.formatHasAlpha(mWin.mAttrs.format) || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDsDy, mDtDy) |