From 8e0626572d44413e77ab73bd859b9d76c16c0d6b Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Fri, 29 Apr 2016 15:58:45 -0700
Subject: [PATCH] Fix a transparent flicker due to wrong crop

When transfering an animation, copy over app animator transformation
in addition to the animation object itself.

bug: 28399102

Change-Id: I8694a76993476b19ec61d74680d6fc51326a18bf
---
 .../core/java/com/android/server/wm/AppWindowAnimator.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java
index abb1bb193f207..49dab0a668150 100644
--- a/services/core/java/com/android/server/wm/AppWindowAnimator.java
+++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java
@@ -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;
         }
     }