From 7aea4f49dececb3accf09f55a2b7f218c16f5887 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 23 Feb 2016 21:21:40 -0500
Subject: [PATCH] Only prolong animations for freeform

So we don't unnecessarily slow down the regular transition

Change-Id: I84e4bf0f9a7caf59dd20478166458f2642e98c80
---
 .../core/java/com/android/server/wm/WindowManagerService.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index f36585e06a189..8fb5e91f19a3b 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3741,7 +3741,8 @@ public class WindowManagerService extends IWindowManager.Stub
         }
         for (final WindowState win : mWindowMap.values()) {
             final Task task = win.getTask();
-            if (task != null && mTmpTaskIds.get(task.mTaskId, -1) != -1) {
+            if (task != null && mTmpTaskIds.get(task.mTaskId, -1) != -1
+                    && task.inFreeformWorkspace()) {
                 final AppWindowToken appToken = win.mAppToken;
                 if (appToken != null && appToken.mAppAnimator != null) {
                     appToken.mAppAnimator.startProlongAnimation(scaleUp ?