summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2016-02-23 21:21:40 -0500
committer Jorim Jaggi <jjaggi@google.com> 2016-02-24 16:13:34 +0000
commit7aea4f49dececb3accf09f55a2b7f218c16f5887 (patch)
treee540817c5070224be290b70be2bd543e51465fb6
parentd2626cd94f5481ebdfb2248bba2976336df5dd58 (diff)
Only prolong animations for freeform
So we don't unnecessarily slow down the regular transition Change-Id: I84e4bf0f9a7caf59dd20478166458f2642e98c80
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index f36585e06a18..8fb5e91f19a3 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 ?