am 111b378a: am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev

* commit '111b378a4e20b9eb2deada94458bae16b91601ff':
  WindowStateAnimation: Clear transformation clip rect.
This commit is contained in:
Rob Carr
2015-10-15 18:46:57 +00:00
committed by Android Git Automerger

View File

@@ -1064,6 +1064,8 @@ class WindowStateAnimator {
mAnimator.getScreenRotationAnimationLocked(displayId); mAnimator.getScreenRotationAnimationLocked(displayId);
final boolean screenAnimation = final boolean screenAnimation =
screenRotationAnimation != null && screenRotationAnimation.isAnimating(); screenRotationAnimation != null && screenRotationAnimation.isAnimating();
mHasClipRect = false;
if (selfTransformation || attachedTransformation != null if (selfTransformation || attachedTransformation != null
|| appTransformation != null || screenAnimation) { || appTransformation != null || screenAnimation) {
// cache often used attributes locally // cache often used attributes locally
@@ -1139,7 +1141,6 @@ class WindowStateAnimator {
// transforming since it is more important to have that // transforming since it is more important to have that
// animation be smooth. // animation be smooth.
mShownAlpha = mAlpha; mShownAlpha = mAlpha;
mHasClipRect = false;
if (!mService.mLimitedAlphaCompositing if (!mService.mLimitedAlphaCompositing
|| (!PixelFormat.formatHasAlpha(mWin.mAttrs.format) || (!PixelFormat.formatHasAlpha(mWin.mAttrs.format)
|| (mWin.isIdentityMatrix(mDsDx, mDtDx, mDsDy, mDtDy) || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDsDy, mDtDy)