From d143142f3d26564feda324968b0469c0f600f0ad Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Tue, 8 Sep 2015 11:18:54 -0700
Subject: [PATCH] Fix thumbnail animation when going into fullscreen.

The fullscreen case depends on the default animation to be set, but only
multi window specs array was used.

Change-Id: I873bcf4168be76f8af66b2a1f50ba3e7e0969f6c
---
 .../core/java/com/android/server/wm/AppTransition.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 5dc6887522f36..c76e64c4ff442 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -1194,7 +1194,7 @@ public class AppTransition implements Dump {
     }
 
     void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim,
-                                             IRemoteCallback startedCallback) {
+            IRemoteCallback startedCallback) {
         if (isTransitionSet()) {
             mNextAppTransitionType = NEXT_TRANSIT_TYPE_CUSTOM;
             mNextAppTransitionPackage = packageName;
@@ -1269,12 +1269,20 @@ public class AppTransition implements Dump {
             mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_UP
                     : NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_DOWN;
             mNextAppTransitionPackage = null;
+            mDefaultNextAppTransitionAnimationSpec = null;
             mNextAppTransitionAnimationsSpecs.clear();
             mNextAppTransitionScaleUp = scaleUp;
             for (int i = 0; i < specs.length; i++) {
                 AppTransitionAnimationSpec spec = specs[i];
                 if (spec != null) {
                     mNextAppTransitionAnimationsSpecs.put(spec.taskId, spec);
+                    if (i == 0) {
+                        // In full screen mode, the transition code depends on the default spec to
+                        // be set.
+                        Rect rect = spec.rect;
+                        putDefaultNextAppTransitionCoordinates(rect.left, rect.top, rect.width(),
+                                rect.height());
+                    }
                 }
             }
             postAnimationCallback();