Merge "Fix a transparent flicker due to wrong crop" into nyc-dev

am: 66a440a320

* commit '66a440a320ece64452ff42dc5721f124fa7b969f':
  Fix a transparent flicker due to wrong crop

Change-Id: I8113d0a453cdca36a00d88fbc9c1e9c5d0942b67
This commit is contained in:
Chong Zhang
2016-05-03 23:48:15 +00:00
committed by android-build-merger

View File

@@ -224,6 +224,12 @@ public class AppWindowAnimator {
if (transferWinAnimator != null) {
mAllAppWinAnimators.remove(transferWinAnimator);
toAppAnimator.mAllAppWinAnimators.add(transferWinAnimator);
toAppAnimator.hasTransformation = transferWinAnimator.mAppAnimator.hasTransformation;
if (toAppAnimator.hasTransformation) {
toAppAnimator.transformation.set(transferWinAnimator.mAppAnimator.transformation);
} else {
toAppAnimator.transformation.clear();
}
transferWinAnimator.mAppAnimator = toAppAnimator;
}
}