From 08f75cfc24aa6cda95a3a21b40f126fd7a6ddf82 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 8 Jan 2018 14:38:53 +0100
Subject: [PATCH] Fix window move animation duration scale

Test: go/wm-smoke
Test: Adjust duration scale, observe windows are moving slower

Change-Id: Iac08be3341c5f80b2723bee23f974ebebdcd07fa
Fixes: 71683150
---
 services/core/java/com/android/server/wm/WindowState.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index d10cb24fc353e..08fb037e61951 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -4580,7 +4580,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
         private MoveAnimationSpec(int fromX, int fromY, int toX, int toY) {
             final Animation anim = AnimationUtils.loadAnimation(mContext,
                     com.android.internal.R.anim.window_move_from_decor);
-            mDuration = anim.computeDurationHint();
+            mDuration = (long)
+                    (anim.computeDurationHint() * mService.getWindowAnimationScaleLocked());
             mInterpolator = anim.getInterpolator();
             mFrom.set(fromX, fromY);
             mTo.set(toX, toY);