Merge "Fix window move animation duration scale"

2018-01-08 16:33:08 +00:00
parent 1cd1af4a83 08f75cfc24
commit edfc6f98e5
1 changed files with 2 additions and 1 deletions
--- 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);