Merge "Fixing error in calculating translation animation."

2 files changed, 4 insertions, 4 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
index 5d58a09..4a0de0b 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -34,7 +34,7 @@ public class RecentsConfiguration {
     public Rect systemInsets = new Rect();
     public Rect displayRect = new Rect();
 
-    public float animationDpsMovementPerSecond;
+    public float animationPxMovementPerSecond;
 
     public int filteringCurrentViewsMinAnimDuration;
     public int filteringNewViewsMinAnimDuration;
@@ -63,7 +63,7 @@ public class RecentsConfiguration {
         mDisplayMetrics = dm;
 
         displayRect.set(0, 0, dm.widthPixels, dm.heightPixels);
-        animationDpsMovementPerSecond =
+        animationPxMovementPerSecond =
                 res.getDimensionPixelSize(R.dimen.recents_animation_movement_in_dps_per_second);
         filteringCurrentViewsMinAnimDuration =
                 res.getInteger(R.integer.recents_filter_animate_current_views_min_duration);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Utilities.java b/packages/SystemUI/src/com/android/systemui/recents/Utilities.java
index 9538ad0..4a1b3b2 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Utilities.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Utilities.java
@@ -29,8 +29,8 @@ public class Utilities {
     }
     public static int calculateTranslationAnimationDuration(int distancePx, int minDuration) {
         RecentsConfiguration config = RecentsConfiguration.getInstance();
-        return Math.max(minDuration,
-            (int) (Math.abs(distancePx) / config.animationDpsMovementPerSecond) * 1000 /* ms/s */);
+        return Math.max(minDuration, (int) (1000f /* ms/s */ *
+                (Math.abs(distancePx) / config.animationPxMovementPerSecond)));
     }
 
     /** Scales a rect about its centroid */